Skip to content
Commit 7488d6df 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: 5de09b24 -s ours
am skip reason: subject contains skip directive

Change-Id: I83f80b03bc0b5226fef0ce8cab0d383fbbd6f781
parents f4861b71 5de09b24
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