tree 0f47d930a97a7b707170e8de3d591c96aa7d748c
parent 01379e6414f614668a7ca4bd7903c11473097717
parent 508b5486f46afad3e70f917b45e61cd4b1520bbb
author Bill Yi <byi@google.com> 1558191548 -0700
committer android-build-merger <android-build-merger@google.com> 1558191548 -0700

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

Change-Id: I7e9613f9a55d5424abc9c92914585768c4cd8757