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

Change-Id: Ib3680317a75ba825293db10e951d72039d083180
parents 1f2ddd8b 801d1779
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