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

Change-Id: I8d6613b9d4b55cc6543e1d0f5f8ad7dadcb01d85
parents 1d5d4c40 0733b635
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