tree b0583f2c65edf00ec43707c87e769bf68a973f0a
parent 0886fa38cf76427d8cd3c7cbe726ed48afd7cd50
parent a20a0e9abe5df5a1e11c6f2bbabbfcd1bb725fa5
author Bill Yi <byi@google.com> 1588178381 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588178381 +0000

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

am skip reason: subject contains skip directive

Change-Id: Iadfe6bfd27485714bb6691f8306863d6f41c5990