tree 25e83a1404d86b48f8c26949ef44c01c9133102c
parent 0768c5bb89c9ca82af0fa888d59c4db8278e2ece
parent 787ca3185d15d8dbd2f68584d7a23be0b5bac61e
author Yi Kong <yikong@google.com> 1631253373 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631253373 +0000

Merge "Do not use pragma diagnostics as a workaround" am: 010d40bb2f am: 63d977a809 am: 3afade4d2e am: e8017cf8b1 am: 787ca3185d

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

Change-Id: I26b5eb32fd091cc409e469f47bdb2ac7c4e66a7d