tree 3628b926ddd2622cd47f22cec9a8b773cb2ef4fb
parent 1f0f127400fe3c39b77e9407e23e52649cc4a2d2
parent b98e5058aa917e867032fc3f38567628ffbac701
author Bill Yi <byi@google.com> 1502034671 +0000
committer android-build-merger <android-build-merger@google.com> 1502034671 +0000

Import translations. DO NOT MERGE am: 62b0ba0030  -s ours
am: b98e5058aa  -s ours

Change-Id: I58b1355274c3c9cbc74d548419fcabc97af4c36d