Skip to content
Commit 9a259d5d 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-dev 

am: bde6a92a -s ours
am skip reason: subject contains skip directive

Change-Id: I159f2fa61e2171cbbe56f77c047774a1bc3d9007
parents 76a64e72 bde6a92a
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