Skip to content
Commit 0e5c34bb 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: b37de731 -s ours
am skip reason: subject contains skip directive

Change-Id: I4a4b41b10d4f468b5d78e396d7f1634ab4762eda
parents b26223d9 b37de731
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