tree 6825fc68cc9e58d9d7be0668cdd7db8d06017600
parent b4d1d2c6540690dfd0d9aae3caa6b0491ffb29bc
parent d743f98026a054ea498721ccf9a5d7e9b7ed9ba2
author Bill Yi <byi@google.com> 1586548409 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586548409 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 500ed46d9e -s ours am: d743f98026 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibc4e7242f808d3fb824b076f0058c6c9c039761d