tree 9ad1035e7a38815710ca2a4091aa75b251a1d417
parent 7d25593d29db255414b7a49dc396a3f43577b9a1
parent 1be176802420d279fefbd117fc96f94af57097e9
author Bill Yi <byi@google.com> 1487260175 +0000
committer android-build-merger <android-build-merger@google.com> 1487260175 +0000

Import translations. DO NOT MERGE
am: 1be1768024  -s ours

Change-Id: Icfe117af9bc8c39ec99578a55b21f98a3d9ca888