tree fd20585b552f753e37b723974216e873b16ca8d8
parent 5ddfd7019baa8e3975d03c95451dbe0bd5541209
parent 1a479ad748e0216fbf66331ed774b0d456c02569
author Bill Yi <byi@google.com> 1688841554 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1688841554 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 74549ba9c3 -s ours am: 1a479ad748 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2ea1e8bc296adda5e41c8a05099887b2b7d3db2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>