Skip to content
Commit 756381bb 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 

am: 83b7531e -s ours
am skip reason: subject contains skip directive

Change-Id: I9b835a1b15237f1237990219e2f64fecedd596a5
parents c79a232e 83b7531e
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