tree 43db8b13a9522aa16dfbba6886ae5c3f6d85e087
parent 862ffd97372fca6e207f4a2807356c72c6fd36e9
parent b8833af64829e2b66312c3bdae46b3bd2b9a226f
author Xin Li <delphij@google.com> 1678835339 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678835339 +0000

[automerger skipped] Merge "Merge Android 13 QPR2" am: 504a8e90b9 -s ours am: b8833af648 -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: Ia5942d178eb70e7976f4d03f94dc3994af8c4c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>