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

Change-Id: I824b160f7132d0e7496ef33395983ef336c09d35
parents 33a2fbcd cba599ad
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