Skip to content
Commit 99f5a38b 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: 86dcc8c1 -s ours
am: 94f7f806 -s ours
am skip reason: subject contains skip directive

Change-Id: I00c0ea636600b88c184d8198d69ac9f88d8dba32
parents 2242fbd4 94f7f806
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