tree 6621539d7923d2114491abf1c40ff185e3f34f5b
parent acb06b5c45f6f57818c3727e22cd15d4783c30cc
parent a204a20fd5e3dddbc4d88d5e0c8c83cfb49809f8
author Bill Yi <byi@google.com> 1628089936 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628089936 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I6902e2239cde43957bd18c4702284fe19d166ca0