Skip to content
Commit 4b54945d 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: ab6ef4f0 -s ours 

am: 6a4598d6 -s ours
am skip reason: subject contains skip directive

Change-Id: I3db9d617c6c6b62dbf782699cf5ca0ed2e6fda58
parents c79a232e 6a4598d6
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