tree 58ea1166c442f242dade9568f9103dc78676ecbb
parent 4b9539b34808950d1d9df26e4c8710e0f95a0888
parent 5acd2224e39d928e3bc4c547efc2063d22995340
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1684876961 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1684876961 +0000

[automerger skipped] Merge "Cherrypick following three changes" into rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am: 36281cb07a -s ours am: 3f09227bb0 -s ours am: 5acd2224e3 -s ours

am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history

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

Change-Id: I5217dd9e1807750daa8d84cda5ad7090784819de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>