tree 18f7f461b30b7ee9515e11037c474ed8c7721923
parent 633e6c0407bdb47ebb2ac8dd0962ca0fb7a9c5fa
parent 609752393883f0645b3d84541a4940470dce3f0d
author Bill Yi <byi@google.com> 1563212763 -0700
committer android-build-merger <android-build-merger@google.com> 1563212763 -0700

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

Change-Id: I7bea9f9dfc915019c3ce3049f8f1881ec38e3b25