Skip to content
Commit fd1121c7 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-r1-dev 

am: 83b7531e -s ours
am skip reason: subject contains skip directive

Change-Id: Ia47b61da94567ab6d04e111a170f99c8e621bc8b
parents a3fc8a95 83b7531e
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