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

Change-Id: I0ec2792ce542e9c39bf25843d16ff5b4df038d68
parents 3e9656e5 c7a7eaa7
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