Skip to content
Commit f4b81d8d 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: 6e2b06a1 -s ours
am: 60314941 -s ours
am skip reason: subject contains skip directive

Change-Id: I30602fd5360aaf9551a993df51171d7545000213
parents 6870412e 60314941
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