Skip to content
Commit 03efc6a9 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: a7608610 -s ours
am skip reason: subject contains skip directive

Change-Id: Icdc97102e568827261a5c83696e2dc60c8e10c0e
parents fec7ec94 a7608610
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