Skip to content
Commit 2c240886 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: e876855f -s ours
am skip reason: subject contains skip directive

Change-Id: I7ae0a6ae0964926b73289bcf54425da88fbd7a80
parents 26aba21b e876855f
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