Skip to content
Commit c9f3d2d6 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: 7e5f2498 -s ours
am skip reason: subject contains skip directive

Change-Id: I18f8076c0ad79a680a0b35bff5f13724a55eecb2
parents e13ad7b6 7e5f2498
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