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

Change-Id: Ief6fffe883dee6bb76e9fbcc16c07bda23a0708f
parents 8ae38a2c 25a43f36
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