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

Change-Id: I03433dd654288e252cad73f45e90c3198a6ef799
parents c108cfdd c3ee236a
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