Skip to content
Commit b03a0203 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: 4712a0f4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifae9fe48ef591c9e2c82af7e1ab0fa598fca6cbb
parents 026aacbe 4712a0f4
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