Skip to content
Commit 7ed2d010 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: 56daf760 -s ours
am: a607e8d3 -s ours
am skip reason: subject contains skip directive

Change-Id: I8e069e815dbeb406f46e96c58dd2b3180dacd996
parents e187e20a a607e8d3
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