Skip to content
Commit 403407ca 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... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 9b5cfc03 -s ours
am: 8939af9a -s ours
am skip reason: subject contains skip directive

Change-Id: I8bf3f8bd3ca2b00ae0f58ab3e75512b598d75e99
parents 2857fdab 8939af9a
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