tree 5ff7767623a6d8bf30a7033da929902cfd65062f
parent dc959a6fe6142553138949a3cd4ad6f030a38cf0
parent 8208049745c13c76a0f2cd28447e9486384241b8
author Treehugger Robot <treehugger-gerrit@google.com> 1623655589 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623655589 +0000

Merge "DO NOT MERGE - Merge ab/7272582" am: 8208049745

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

Change-Id: I6eb1958535e12bf2bb6dfaafc5f423cb1ac28139