Skip to content
Commit 0df74430 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: 1feb0dfd -s ours
am skip reason: subject contains skip directive

Change-Id: I61c45de16e2a398629d1580a4035bc82fc9904f2
parents eb840269 1feb0dfd
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