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

Change-Id: I87b460d3f477ab36826ff5c0241a9ce05c8a9a10
parents fd01f3c9 0e5c34bb
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