Skip to content
Commit 31d62741 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: 0906e02a -s ours
am skip reason: subject contains skip directive

Change-Id: I32e5d4d452538b501d9b538e188316dab0548f45
parents fb900c84 0906e02a
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