Skip to content
Commit c67fc520 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: Id017885d9e75d86c34c23bcd0568cc585d1aa157
parents cba599ad 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