tree 027714aed2ec42a5cfcdc00f92ccbfbf952bd8a5
parent 7cbd201dac46e02284e25a0e312ea5bc3757a2f0
parent acea4f5397972c4d51f5d1f661dedbacda26d858
author Xin Li <delphij@google.com> 1633679802 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679802 +0000

[automerger skipped] Merge Android 12 am: 753edea69c -s ours am: 9f5396de9b -s ours am: acea4f5397 -s ours

am skip reason: Merged-In I74c4c80e03bfa41b9e8cd13f3cfcbe9ac6efdd50 with SHA-1 55b3b0dc94 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/libutf/+/1847428

Change-Id: Id1c3b0a6bfb70e7639184df15b0f009c076e169b