Skip to content
Commit fa5d644e 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: 311594b6 -s ours
am: a7df76d3 -s ours
am skip reason: subject contains skip directive

Change-Id: I3c011269d37142c95acda2121c14130e93fcbc0b
parents 369c100c a7df76d3
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