Skip to content
Commit 5621f5b1 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: 83b7531e -s ours
am skip reason: subject contains skip directive

Change-Id: I5f325d53277713edc6e1a8e859dd92910fe10521
parents 3f8fda2f 83b7531e
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