diff options
author | Seigo Nonaka <nona@google.com> | 2023-05-13 09:11:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-13 09:11:29 +0000 |
commit | 7c80ad91fd9b4b90801f07e56cc13823bc9987ae (patch) | |
tree | 58ea1166c442f242dade9568f9103dc78676ecbb | |
parent | 50a3fdb77f50e60ed13de34631fc7fc378b28e15 (diff) | |
parent | 2c84e62504a934993c5aba1fad915ce6da270305 (diff) | |
download | freetype-7c80ad91fd9b4b90801f07e56cc13823bc9987ae.tar.gz |
[automerger skipped] [automerge] Cherrypick following three changes 2p: b0d165057a am: 34fc79aee7 -s ours am: 562729984b -s ours am: e28b316a06 -s ours am: 2661925a58 -s ours am: 2c84e62504 -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: Ic5dcab73afa85a0b06b6dad64cfa89f0695f3f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions