Skip to content
Commit cb227741 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-qpr1-dev 

am: 76a8d1c2 -s ours
am skip reason: subject contains skip directive

Change-Id: I6c0e70daefe375ce75cb7453de18ca9213e9d1a0
parents 5b187472 76a8d1c2
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