tree 5ff7767623a6d8bf30a7033da929902cfd65062f
parent 1b10e81f4531d79207c92b15fdcd02a7a3d5fccf
parent 3fb418dd588c2800c93cbd821affd18bf3214377
author Xin Li <delphij@google.com> 1623655581 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623655581 +0000

DO NOT MERGE - Merge ab/7272582 am: 3fb418dd58

Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/1736119

Change-Id: Ie61d3888343b9d77a7b481c215cfe1f54bc2c101