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

Change-Id: Icd3e27d1584438c00050e065d183b04ea2432fab
parents 6d3d9db2 8c7a9b95
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