tree f42a82395735950100a850c43032f2fb42639c6f
parent a11bd5b1ef5bd70d80f96bf6923413cf78cc3e51
parent d5ad1ef20b53fc63369cd16349eb8998883a1605
author Xin Li <delphij@google.com> 1696638047 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696638047 +0000

[automerger skipped] Merge Android 14 am: 2389c22162 -s ours am: e5b985c5ca -s ours am: 1f768cfe10 -s ours am: ecc1a19bf7 -s ours am: d5ad1ef20b -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: Id52bd7091c1dd9933d69477baf66824e39585b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>