aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2023-04-05 01:18:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-05 01:18:58 +0000
commitd0ea102befca5798dd98d63bae220d7e5dfac72c (patch)
tree234ad317e206c974e924b6e8391f37f236de846a
parent8abb5b963d8f3bac3224c09edff6dcbbd11bf508 (diff)
parentfa4a08921a89b20389b2e61d8817858d4bca291c (diff)
downloadfreetype-d0ea102befca5798dd98d63bae220d7e5dfac72c.tar.gz
[automerger skipped] DO NOT MERGE - Cherry-pick two upstream changes am: fa4a08921a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327782 Change-Id: I20004dd2ca60427df84ba1cdc9858f9a838762d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions