tree 3977134d1f0c5d774cce1210b025491658ea1ab6
parent 77437eafaba4b385eb609f4ea25a3c7fc95021f6
parent 01379e6414f614668a7ca4bd7903c11473097717
author Bill Yi <byi@google.com> 1558192294 -0700
committer android-build-merger <android-build-merger@google.com> 1558192294 -0700

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

Change-Id: Ifa305e87acbc3b03931925b1893d413e5d82e51a