tree 5ff7767623a6d8bf30a7033da929902cfd65062f
parent 21ec10e26f661081e10ee89765d005cd31939c2b
parent dc959a6fe6142553138949a3cd4ad6f030a38cf0
author Xin Li <delphij@google.com> 1623656683 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623656683 +0000

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

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

Change-Id: I5f494b21457e78ef6c476182fc3b810f680e173e