Skip to content
Commit 36f6254e 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: 72babaee -s ours
am skip reason: subject contains skip directive

Change-Id: I6442ec6429711058a2eb66a80a3c8bf0582eeea4
parents 1c03d902 72babaee
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