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

Change-Id: Iacbee856fb002ad738ea09baee10f6a019a5d42c
parents 5304b688 a1a6fe2b
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