Skip to content
Commit 9f0df181 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: e0c262b7 -s ours 

am: c05f11a0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6bd2d37a6e7f438c8d30b5ec1149e99d807703b
parents 6eafacb8 c05f11a0
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