tree 95fda543f4675ae6ecf3d3f9762ba546bf2e3046
parent 609c18fa9caa5804f336223cc54ebb05299c154c
parent 15ae4ea8e237d6edccf6b6f5884a46c9e0942d5c
author Bill Yi <byi@google.com> 1585172633 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585172633 +0000

[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 15ae4ea8e2 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifeaf67de45c1d064b1abaee04e27590dfdbb2843