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

Change-Id: I092d34d416f90db8f3073dc1533227f8b4218f04
parents 7de2ac9c d0461a53
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