tree f42a82395735950100a850c43032f2fb42639c6f
parent 70bb8dffd4c9e7d64b0682bcbcd3cf7c6e1dd561
parent e4a6cc6f5bc957b9e282e863832d441c74d71bfa
author Xin Li <delphij@google.com> 1696638409 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696638409 +0000

[automerger skipped] Merge "Merge Android 14" into main am: 8697ac6648 -s ours am: 4c9f1bc92e -s ours am: 695c0c6e9d -s ours am: 4e7cbecbd6 -s ours am: e4a6cc6f5b -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: Ib0398edf428c1dfdaaaa7af10c0327334991d7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>