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

Change-Id: If15eb1005a3100bb104ff094b21bb0100232429a
parents c185e17a e0c262b7
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