Skip to content
Commit a607e8d3 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: 56daf760 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie0ccd499f2ab81eda540909285b27e85f409e17c
parents 94230254 56daf760
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