Skip to content
Commit dcd40098 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: 4fd92151 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifb2c86fd56e21fda658b4c7b1e8e7dbabd5367b4
parents 52cfa0e4 4fd92151
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