Skip to content
Commit 6c4b6f82 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... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: a1a6fe2b -s ours
am: 8b5025f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I53e148cde0f2097a8a40b7fef6e7195edf87727b
parents 13444159 8b5025f0
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