tree 0f0416d588d27ab6807a31100f6eb6575edb665c
parent 0cc7d9a2af4b8186c5fae6f56920d9e124e53ecb
parent f896493c700075fefb90fe4f3a8330c1224c6629
author Bill Yi <byi@google.com> 1539757498 -0700
committer android-build-merger <android-build-merger@google.com> 1539757498 -0700

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

Change-Id: I4d93781a7e2f2d20b1d0e25338af6e24f1b5a448