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

am: f97d1593 -s ours
am skip reason: subject contains skip directive

Change-Id: I2d08d4d24d9324c4555069f70114b5946036ec72
parents 5ea18e82 f97d1593
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