Skip to content
Commit e05e9587 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: Id4932433b24a1d3328f4669ec6619f734f8bd3a5
parents aae5671b 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