Skip to content
Commit 08b872b3 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: 7545f42d -s ours
am skip reason: subject contains skip directive

Change-Id: I74c525a66e4bdd7797db006a7bdf8dbd425dbb93
parents 8e624004 7545f42d
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