diff options
author | Xin Li <delphij@google.com> | 2023-10-06 07:58:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 07:58:51 +0000 |
commit | 4c9f1bc92e0ce467ef2fcf14e1a428edcf385512 (patch) | |
tree | f42a82395735950100a850c43032f2fb42639c6f | |
parent | e5b985c5ca250e49e4a12999ed4f7ba4efb16a4a (diff) | |
parent | 8697ac66489dca8c0726f1635b9091dc44cfefc2 (diff) | |
download | freetype-4c9f1bc92e0ce467ef2fcf14e1a428edcf385512.tar.gz |
[automerger skipped] Merge "Merge Android 14" into main am: 8697ac6648 -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: Iee207171e0bbe756fbcd25e5f5dc0bee01b88b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions