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

Change-Id: Id7bd1bad477b9d751235519e042da6541ab2a156
parents 42b3f9e9 a5121a4f
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