tree 7195f13edd8afcb0ede6e3a80071d1b9418ea57f
parent 8706c94584947b9b7cac98805fc4356b5ccdb417
parent 0517d3d5e5ad0959b861758a4697b52120e41139
author Bill Yi <byi@google.com> 1561526928 -0700
committer android-build-merger <android-build-merger@google.com> 1561526928 -0700

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

Change-Id: Ic04259ff8446ef2c500f8d6fee6211b80847c911