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

Change-Id: I2b84532c9db62f7155bd4683d9b0b02484f93271
parents 27c67b2b bde6a92a
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