Skip to content
Commit f97d1593 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: I871472cb73d956e6f4c0db622025b63d2ecd7789
parents 25668fff 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