Skip to content
Commit 71f6138d 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-r1-dev... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 85a56ba1 -s ours
am: 99a10329 -s ours
am skip reason: subject contains skip directive

Change-Id: I5c8366909ff63c6446d40e79289cbaa524cd253e
parents f377d2c5 99a10329
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