tree ec8e03ad9e861c34c109475520712246845e6c81
parent abcbec2acd69f13f5cb7482855a869d70505d220
parent b6369db7e090b1f70d5ee5214d3ef33eea9fdd03
author Bill Yi <byi@google.com> 1645727896 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645727896 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6369db7e0 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16978594

Change-Id: I56925eb8ce39a5e75baf55a8569f387facec8aef