tree 43db8b13a9522aa16dfbba6886ae5c3f6d85e087
parent b66d208084138e19450d407ce678646c45121c6a
parent 220cdcaf98291b69888c4e4e16dd6ba8a9d25cae
author Xin Li <delphij@google.com> 1678845858 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678845858 +0000

[automerger skipped] Merge Android 13 QPR2 am: bd7389af6d -s ours am: 95a6ad724d -s ours am: 862ffd9737 -s ours am: eab8ed0543 -s ours am: 220cdcaf98 -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: I636fe6a1d21f6a01e6148934eaefecfdad64f448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>