Skip to content
Commit 7fd9a81f 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: 2f5007db -s ours
am skip reason: subject contains skip directive

Change-Id: Id627e7ef0fbcf5e9f6657eb1bace529ca36880b3
parents 5c27a9c2 2f5007db
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