Skip to content
Commit 3633c30c 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 skip reason: subject contains skip directive

Change-Id: I6ddd3a2f1d738ea3b49e746ff102fe7515c9d50a
parents 83b7531e ab6ef4f0
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