commit | dda714278c2ec9db1a9d7cd1f4fd9bd413e0d619 | [log] [tgz] |
---|---|---|
author | Werner Lemberg <wl@gnu.org> | Wed Apr 05 01:52:53 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 05 01:52:53 2023 +0000 |
tree | 06c284993deb038571bd45e1ebc1e1f6f9293893 | |
parent | 70409f79f5e37628993434ffe9ed11947396b63a [diff] | |
parent | 9406836f7d632972c4bcf237f407baab911dd4d7 [diff] |
[automerger skipped] DO NOT MERGE - Cherry-pick two upstream changes am: 098d96ab9d -s ours am: 9406836f7d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327241 Change-Id: Id14bcbaffbccf876c85d3da2d01af7a1da379107 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>