Skip to content
Commit bd19b399 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-r1-dev 

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

Change-Id: I10a2279449240cdd44a046411ad5701d617348fe
parents 10eba2ae d5e7e075
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