tree 027714aed2ec42a5cfcdc00f92ccbfbf952bd8a5
parent 04a632dce34189e3cf08381217bcacbfaa8ac461
parent b037d6bd4580c3fa06e140a673ef681bc9af22c6
author Xin Li <delphij@google.com> 1633683591 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683591 +0000

[automerger skipped] Merge Android 12 am: 753edea69c -s ours am: 9f5396de9b -s ours am: acea4f5397 -s ours am: 3a2d69f7e3 -s ours am: b037d6bd45 -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: Ic9e27bdb93876ecdb3fe62566aea854512ae4c82