tree 25e83a1404d86b48f8c26949ef44c01c9133102c
parent 3afade4d2ebc1c4a2f254f7ab6c1de21780df4a4
parent 82cc36ec48b4482953fe347c7275a70c74c30ff7
author Xin Li <delphij@google.com> 1633657198 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657198 +0000

[automerger skipped] Merge "Merge Android 12" am: 6b0c727173 -s ours am: 82cc36ec48 -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: Iffeb3f56e19dee531cbf82fb3f611c423a5df6cd