tree 25e83a1404d86b48f8c26949ef44c01c9133102c
parent 787ca3185d15d8dbd2f68584d7a23be0b5bac61e
parent cbee986d0248d1aa679c119da4c20cb9b207cec6
author Xin Li <delphij@google.com> 1633681812 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681812 +0000

[automerger skipped] Merge "Merge Android 12" am: 6b0c727173 -s ours am: 82cc36ec48 -s ours am: 11a2017906 -s ours am: cbee986d02 -s ours

am skip reason: Merged-In Ib18020388a4609045e4e0138f8671c7ef1a5457b with SHA-1 63d977a809 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/harfbuzz_ng/+/1847350

Change-Id: I28a060d03a916300704ddd6fe13ae1a90056da53