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

Change-Id: Ied523f24666ed0d4d2e7bcb563d54e6d005179b3
parents 047704a0 1b7a7012
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