Skip to content
Commit b532faa7 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: 4769e819 -s ours
am skip reason: subject contains skip directive

Change-Id: I28086d495911ad8df40e2e77bc888722864cec48
parents 73e4e858 4769e819
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