Skip to content
Commit 84345490 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-qpr1-dev 

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

Change-Id: I31190e96eb2b9111e1505811f4ccb3c3e80a77dc
parents eb699b5d aaea2b58
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