| commit | affa7eab30ddb92d1064799b8203ff14dd8d8aa1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 14 00:59:38 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 14 00:59:38 2024 +0000 |
| tree | 688c97d6ae89f4a65828b23fdf0be624f1670aa4 | |
| parent | 1065951853386bcc2c9dd5e85bb02bb9f69b67a7 [diff] | |
| parent | c0e41846aa922ddcbd04bc59cb745b0d7d28bbf3 [diff] |
[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: c0e41846aa -s ours am skip reason: Merged-In I1065c5443246d2da24e74e6bc3d4eaab30fd96dd with SHA-1 4392a191dc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/30283695 Change-Id: I560aa1d82fb43ed423f5152321037bd93809ddcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>