Skip to content
Commit d68b1dc2 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: 8931739c -s ours 

am: a6e73456 -s ours
am skip reason: subject contains skip directive

Change-Id: I44b43d91d65bee00e54fb67bd7a27d417e48bf8e
parents de03705b a6e73456
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