Skip to content
Commit 1f24aac7 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: 3ca8c70e -s ours
am skip reason: subject contains skip directive

Change-Id: I4295c873aebd86f331447788b991a00ea16d019b
parents b6125edb 3ca8c70e
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