Skip to content
Commit 4b028ea7 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: 72babaee -s ours
am: 36f6254e -s ours
am skip reason: subject contains skip directive

Change-Id: I5f78a3ffc9c0fb487d547a297379a493405b8618
parents 9ff0bae0 36f6254e
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