tree 6c39867e63802fdc1e2dc34dd1416f99e69121f6
parent 6edac8db6bc219bb954ab35c69c53eae857c74e3
parent cae0611e289335b6f89bae9e115f05f73b733fab
author Bill Yi <byi@google.com> 1584745655 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584745655 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 42838e2ee7 -s ours am: cae0611e28 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifa05432bcd530b32f9325b5ccfbfb65fe9595e20