tree 43db8b13a9522aa16dfbba6886ae5c3f6d85e087
parent 33574b31932ab57befdc7aca0363806efaeb1325
parent 8d4ce9cf26b50d169d848f4217371ad5068f79f6
author Xin Li <delphij@google.com> 1678845985 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678845985 +0000

[automerger skipped] Merge "Merge Android 13 QPR2" am: 504a8e90b9 -s ours am: b8833af648 -s ours am: 6c152889ac -s ours am: 675d4ab0fa -s ours am: 8d4ce9cf26 -s ours

am skip reason: Merged-In I80f56f9865672006130c1f29ada35321e02232aa with SHA-1 d0d25b4d86 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/2487097

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