tree bda43a28dc47b636fd4c231e2362c68ec61725f4
parent 59afe62da6c23c20799d2292e5fef3f2a5f87111
parent 22d2a4485cdef527ed0fa5b246f2d1781f80ccb6
author Xin Li <delphij@google.com> 1696582783 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696582783 +0000

[automerger skipped] Merge Android 14 am: 2c42524cd6 -s ours am: 22d2a4485c -s ours

am skip reason: Merged-In Ide274c34a4d91d5fb9001f4b85a4d16828e145bc with SHA-1 eb2cfc499d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/2777009

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