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

am: 4ffaa9a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I494b1a51fcc57ad0f1f82bbf4522055360e5919f
parents 4c20c8c1 4ffaa9a2
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