| commit | 035eebe625b984425a88cbea3b5ffa287ac0e9c3 | [log] [tgz] |
|---|---|---|
| author | Seigo Nonaka <nona@google.com> | Tue May 23 21:25:47 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 23 21:25:47 2023 +0000 |
| tree | 58ea1166c442f242dade9568f9103dc78676ecbb | |
| parent | 3be42ca1b894c55290225d968ead6db62f3bd082 [diff] | |
| parent | 4b9539b34808950d1d9df26e4c8710e0f95a0888 [diff] |
[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am: ecaaa4add6 -s ours am: 9ca0c8043c -s ours am: 371e3c02ae -s ours am: 8eadb674ea -s ours am: 4b9539b348 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I6497e8177aacd561b94fe9ba1e95c020ed2da554 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>