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

Change-Id: Ic37de2081b841d2f870fd0e5bf13c86d863b23b4
parents 76ca4c55 3e9656e5
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