Skip to content
Commit 62173d1e 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: 403c841e -s ours
am skip reason: subject contains skip directive

Change-Id: Ia5c58414f4aa229595fa6588ce1a2329f7c5f383
parents 48670a21 403c841e
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