tree f42a82395735950100a850c43032f2fb42639c6f
parent ecc1a19bf790ee9e2591113caad5f54bc886f206
parent 695c0c6e9d5e6bf30b487b274eb4dab14208f6bd
author Xin Li <delphij@google.com> 1696586251 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696586251 +0000

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