tree 0d589f942ded5ca734691ba2939a3716457c8859
parent a4d499f67e11567dbc5d268c70229896e47fa2b7
parent d261f80c30882c940dd59b5471024065163d2305
author Bill Yi <byi@google.com> 1584646882 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584646882 +0000

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

am skip reason: subject contains skip directive

Change-Id: Iead8c99b026c7e9d8fed8b8b830489cd5f7c77d3