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

Change-Id: Icba16c513d008c3cf8e617094b3e808bf8f5b18b
parents 03efc6a9 c26bc895
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