Skip to content
Commit 60314941 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-qpr1-dev 

am: 6e2b06a1 -s ours
am skip reason: subject contains skip directive

Change-Id: I72e7d34c2fb0b004de809e0c6b9891c93bcf5bc9
parents eef7869a 6e2b06a1
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