tree 25e83a1404d86b48f8c26949ef44c01c9133102c
parent e8017cf8b1552ff030fd669a8c1ee4031837c6de
parent 11a2017906ed8b4f1358f843c1a9741ff58fded5
author Xin Li <delphij@google.com> 1633679834 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679834 +0000

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