tree 33f4eb1e60e0d2e481d36a323062603823ab079a
parent 079e7159e52ebd1dae2f999180076b0f3d33be80
parent 98986c031679e2ac8c4cf5c5644af98199773fda
author Bill Yi <byi@google.com> 1517074491 +0000
committer android-build-merger <android-build-merger@google.com> 1517074491 +0000

Import translations. DO NOT MERGE
am: 98986c0316  -s ours

Change-Id: I3a2fd7bad00b379313aa5ca7f222b32a4f25f509