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