tree 4daa327ad78fafcddaa1ccbf1f22bb66fa04eac3
parent 294406ed52bb94130ae60ebe4bb8e644ee6ee051
parent 971ceb6e23ea4b001e984bc0039ff916f787cb2d
author Bill Yi <byi@google.com> 1545617222 -0800
committer android-build-merger <android-build-merger@google.com> 1545617222 -0800

[automerger skipped] Import translations. DO NOT MERGE
am: 971ceb6e23  -s ours

Change-Id: I581b52548f2dd23522633dbd748aa9aec3214e1e