| commit | c6254ded9e80ddf784582a98659ea0ccb2571391 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Dec 13 19:14:17 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 13 19:14:17 2024 -0800 |
| tree | 688c97d6ae89f4a65828b23fdf0be624f1670aa4 | |
| parent | ef9eab051212f093a15af8a9a145f4e95471a965 [diff] | |
| parent | 193cdc06f49bb961653bbe81cde3613ac04a13b1 [diff] |
[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: 193cdc06f4 -s ours am skip reason: Merged-In I1065c5443246d2da24e74e6bc3d4eaab30fd96dd with SHA-1 4392a191dc is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/3413897 Change-Id: I0dcf7482e34139c5577479d7a93aabffc87bd06e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>