tree f42a82395735950100a850c43032f2fb42639c6f
parent 0a27b23453f599e021320d7f76d0798f1cc56c47
parent 1f768cfe102714c86ac0a77ab4523acc6b18ea4f
author Xin Li <delphij@google.com> 1696585886 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696585886 +0000

[automerger skipped] Merge Android 14 am: 2389c22162 -s ours am: e5b985c5ca -s ours am: 1f768cfe10 -s ours

am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history

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

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