tree ec422cdbcf10ef48fe37c98c2784709334d80a5a
parent 4063e3393ade92c8f6a4e94a5b5f111fc4ca47c1
parent 97339e3d23c94069ad67edf27a0e27b6141ca8f2
author Bill Yi <byi@google.com> 1558190599 -0700
committer android-build-merger <android-build-merger@google.com> 1558190599 -0700

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

Change-Id: Ic6a090c4de07544adb5907af2c41928a21c9224e