Skip to content
Commit 1dbca4e6 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: 52ed298e -s ours
am skip reason: subject contains skip directive

Change-Id: I6d2931c084f382f28a9023cd239201ec825ecb80
parents db5ec2fb 52ed298e
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