Skip to content
Commit 57e1350c 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: 760558e0 -s ours
am skip reason: subject contains skip directive

Change-Id: I70551d8f5c178f65f155d9141b5d129f5114263f
parents f4171246 760558e0
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