Skip to content
Commit 26aba21b 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: 5de09b24 -s ours 

am: 7488d6df -s ours
am skip reason: subject contains skip directive

Change-Id: I5f1e1708b3c0c0845643cd4b3c0756f06e5c0ffd
parents ed749e50 7488d6df
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