Skip to content
Commit e8b96c45 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: 8931739c -s ours 

am: a6e73456 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d5193e298818d94425d28492caaafcf4d6ea295
parents d4795138 a6e73456
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