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

Change-Id: I84861354ea6aa23c49245021d1f6ef69a29a540e
parents f54fb9d9 d90e5e3d
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