Skip to content
Commit 59f2ac12 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 

am: 88ef8325 -s ours
am skip reason: subject contains skip directive

Change-Id: I0aef841d173666ec9b60708902590ee0a4239a06
parents 77f9d806 88ef8325
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment