tree b3a9224bf86569e0f8d5844244b4336871b24875
parent 8e9600ce03d1580ae307dc68168d38cb9269d057
parent e2a1cd28bc6c4cc98fa87dc59adc7eb6def28ef3
author Bill Yi <byi@google.com> 1694130846 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694130846 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: e2a1cd28bc -s ours

am skip reason: subject contains skip directive

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

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