Skip to content
Commit 1a7b8395 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: 9ea1842c -s ours
am skip reason: subject contains skip directive

Change-Id: I99cd5beff45284f520dbf22c212d999db9eeb377
parents cd18be21 9ea1842c
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