tree b0583f2c65edf00ec43707c87e769bf68a973f0a
parent b4ef3da9a0b3c7e0d871f9f7418fbd44a26c8c94
parent 37b391b38653cfdcc08a234e7f8178ca91bfbc1e
author Bill Yi <byi@google.com> 1588179707 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588179707 +0000

[automerger skipped] Import translations. DO NOT MERGE am: a20a0e9abe -s ours am: 37b391b386 -s ours

am skip reason: subject contains skip directive

Change-Id: I81ee9e84c4d84e5afc02da35b92580d67690da9e