Skip to content
Commit f77da413 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: d4795138 -s ours
am: 5de36290 -s ours
am skip reason: subject contains skip directive

Change-Id: I6544309a4ffc4b132923f36fdc5ab66dc44db4ec
parents 4e2e511a 5de36290
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