tree 1f45fb29de6b2e757e67a4dde724005a67f5f689
parent 27fc82a83ba1a70607ce46b592993446e1c650bf
parent 035560ea011ce034b478e67002dcbb21368b980f
author Bill Yi <byi@google.com> 1523757488 -0700
committer android-build-merger <android-build-merger@google.com> 1523757488 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 035560ea01  -s ours

Change-Id: I0fb47be471b5da6a0cd81ad9cc1aa6224ca0be9d