tree 6c39867e63802fdc1e2dc34dd1416f99e69121f6
parent 93380c8a5f5d8375a64f053b5d336dd752bbabdd
parent 31f2a76cd7c169fe9922bd1bbdb37a82aca82d5f
author Bill Yi <byi@google.com> 1584737776 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584737776 +0000

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

am skip reason: subject contains skip directive

Change-Id: Ia6ddf11b9713c01ab4dde6825aad897c38a4bbde