Skip to content
Commit 6d3d9db2 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: 78e07dc7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd67901bd9f079efe94fbc6fe7a01ad9a47f7f25
parents 7baaacc3 78e07dc7
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