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

Change-Id: I4c41dd878ec20d637002b7dcd1298eebff267134
parents 4e48fd22 a2bee96a
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