Skip to content
Commit 5ea18e82 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-r1-dev 

am: 42b3f9e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I3103664dcd7bfd7ea0751053aeb01615bdf8f036
parents 78914abd 42b3f9e9
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