Skip to content
Commit 843ab671 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: 3b7a08e3 -s ours
am skip reason: subject contains skip directive

Change-Id: Icebc0b765fd4aac0500d77059235bf63422779df
parents 2d7c9546 3b7a08e3
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