Skip to content
Commit f0fa66b2 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: 76a4b5d7 -s ours
am skip reason: subject contains skip directive

Change-Id: I30479c81c208294f5b4976ab41d29360dd872deb
parents fa72dc4c 76a4b5d7
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