tree ee483c78ea12014e2e9a1a60ba774a30962857a5
parent 48dc60e38894b7954ee2500dc77e5303943776d5
parent 4e50d9b0f34f7efb29c816454d90d020959da33a
author Bill Yi <byi@google.com> 1574920722 -0800
committer android-build-merger <android-build-merger@google.com> 1574920722 -0800

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

Change-Id: Ic025d341ea7c28e3f40e4c26f98e0369af9fd6d4