diff options
| author | Werner Lemberg <wl@gnu.org> | 2023-04-05 02:37:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-05 02:37:24 +0000 |
| commit | 981e6f176dedfc8935e09d8101bec872d7a76e54 (patch) | |
| tree | 06c284993deb038571bd45e1ebc1e1f6f9293893 | |
| parent | 6b4d2bb2b3e850d9ef59b005881c257ff3347e08 (diff) | |
| parent | dda714278c2ec9db1a9d7cd1f4fd9bd413e0d619 (diff) | |
| download | freetype-981e6f176dedfc8935e09d8101bec872d7a76e54.tar.gz | |
[automerger skipped] DO NOT MERGE - Cherry-pick two upstream changes am: 098d96ab9d -s ours am: 9406836f7d -s ours am: dda714278c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327241
Change-Id: I7837edc221e33a64bdf2cbec258dc14c0090b7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions