Skip to content
Commit 83b95077 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... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 2611fba3 -s ours
am: 74f5559d -s ours
am skip reason: subject contains skip directive

Change-Id: I264ac0cee53aa6b45bd9e688f7f271cfbf4d5c2e
parents d57c9734 74f5559d
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