tree 25e83a1404d86b48f8c26949ef44c01c9133102c
parent 6ab231bd47b2a1fdbc6927d8667bdee916ef137a
parent 3afade4d2ebc1c4a2f254f7ab6c1de21780df4a4
author Yi Kong <yikong@google.com> 1631251125 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631251125 +0000

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

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

Change-Id: Ic1cb6e68574b9bb0cd47321d3593583c422d0712