tree 38568007c48b53d72c1737b31a8537771b6c8a85
parent b58ab1607baa6442ef03205c2e4f80de746e60a9
parent 623f2340fe60735e1db425dd03a70933127021a5
author Bill Yi <byi@google.com> 1545617465 -0800
committer android-build-merger <android-build-merger@google.com> 1545617465 -0800

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

Change-Id: I82b50937786d5b57ebeb4f5266c84f71f10fb33f