tree 282aea1c07568512121c7b6762eda04aeeacd40e
parent 2639bab727a8dd9fb74311f4f146632bec6f947c
parent 436c455a3737dbf59f1265f999ab03940e840723
author Bill Yi <byi@google.com> 1586550415 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586550415 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 500ed46d9e -s ours am: 62f41b5368 -s ours am: 3143f8e580 -s ours am: 436c455a37 -s ours

am skip reason: subject contains skip directive

Change-Id: I1f2d8c24049bd91939f676cbed97975ae00e3e35