tree a58b069a6ede7172eafdee0705b51237b401a8f9
parent b7c79a80b274bb3601f465ce995d33acfece0fe0
parent 6a885ae2426b2bfed3ef60d18de65e52c331fcf8
author Bill Yi <byi@google.com> 1562340378 -0700
committer android-build-merger <android-build-merger@google.com> 1562340378 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 6a885ae242 -s ours
am skip reason: subject contains skip directive

Change-Id: I7d62a3d152ce01dc19db8c547e9708c01e1f5ce2