Skip to content
Commit d1f76e99 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: 85dcca9b -s ours
am skip reason: subject contains skip directive

Change-Id: I994a3ec3d3873e83fa33eaa59f95aae3699069cf
parents 6ea41cb0 85dcca9b
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