aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-10-06 08:59:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-06 08:59:45 +0000
commit1f768cfe102714c86ac0a77ab4523acc6b18ea4f (patch)
treef42a82395735950100a850c43032f2fb42639c6f
parenteb6b2c73bf695e8dd33c181602fb0ad0ff813c5e (diff)
parente5b985c5ca250e49e4a12999ed4f7ba4efb16a4a (diff)
downloadfreetype-1f768cfe102714c86ac0a77ab4523acc6b18ea4f.tar.gz
[automerger skipped] Merge Android 14 am: 2389c22162 -s ours am: e5b985c5ca -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: Icf9fb61cf7d75a4c68194aefafe75055b7af3bcc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions