| commit | 37cd75d05b330d3d1da3b8b746b2daa34d9ea1dd | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Sat Sep 07 02:43:33 2024 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Sat Sep 07 02:43:33 2024 +0000 |
| tree | 89c3aebf0417f000348272af65c177c158426c23 | |
| parent | 0343a1e589333665ecd55b96cc19d6f8458c523b [diff] | |
| parent | 858bb3b0c2e7f30e7484a60494155ecd0fe2c813 [diff] |
[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 858bb3b0c2 -s ours am skip reason: Merged-In I848cdd285261cd958a5c646e4a6ae99dd05eb07b with SHA-1 b7a7c63e02 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/3257834 Change-Id: I83ea91465df5028b8e019ad1e4f3fc5b2e35368e Signed-off-by: Automerger Merge Worker <[email protected]>