Skip to content
Commit d4abcd0f 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: 8f1b7c77 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib011f25791440ba6be99cd4e3f994c423604738b
parents 5bb09723 8f1b7c77
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