tree 879acde9cf9e2ffe51709c83b8fe9016f472cfbb
parent 5ea423622dc4cd7c877f3b3ae7296df45b9eb35a
parent dbfd31384c0328a5357f9efbe678e7ee50e616f6
author Bill Yi <byi@google.com> 1467323520 +0000
committer android-build-merger <android-build-merger@google.com> 1467323520 +0000

Import translations. DO NOT MERGE am: 6b0a720ead  -s ours
am: dbfd31384c  -s ours

Change-Id: Ie82973d39c5b5742230e50e39b31f0ce031ae58b