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

Change-Id: I4eff119da425ecfc9f2170489435e453cfe4411c
parents 67c21d43 a1f6fbd4
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