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

Change-Id: I8ccc25f6023100a1abbd3413f69c593ced904939
parents 258eba10 da2d0d13
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