Skip to content
Commit 166e30c7 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: ed54ec22 -s ours
am: 706c57f0 -s ours
am skip reason: subject contains skip directive

Change-Id: Id0b8b39b8c6d3fa5024ceec076f50244efb28430
parents 7631a712 706c57f0
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