Skip to content
Commit b0d1548e 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: 8292b6bb -s ours
am skip reason: subject contains skip directive

Change-Id: Ic91b3e988cdf7a6e8aaf971f855e42ed021ca428
parents 8cdf1fb4 8292b6bb
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