| commit | 228fc22c9df2c2d49f371dd2c435ad69368cfdec | [log] [tgz] |
|---|---|---|
| author | Seigo Nonaka <nona@google.com> | Sat May 13 07:27:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 13 07:27:45 2023 +0000 |
| tree | 20675215494af58053a383e6cfcb82e597490dcd | |
| parent | 8bc20bcd29162c3865cea1eaeece78d3f31698da [diff] | |
| parent | e28b316a06cff7712566d4cb32671e362c0315be [diff] |
[automerger skipped] [automerge] Cherrypick following three changes 2p: b0d165057a am: 34fc79aee7 -s ours am: 562729984b -s ours am: e28b316a06 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: Iab40ea31cf819529c39175b7d54e3e13cdfc7a7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>