diff options
| author | Werner Lemberg <wl@gnu.org> | 2023-04-05 03:03:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-05 03:03:35 +0000 |
| commit | a537d6e740be42ce29a81d118f73ba3c50e888ec (patch) | |
| tree | 234ad317e206c974e924b6e8391f37f236de846a | |
| parent | f6a122df4f54865877f7593f45926b9ddae6a835 (diff) | |
| parent | 981e6f176dedfc8935e09d8101bec872d7a76e54 (diff) | |
| download | freetype-a537d6e740be42ce29a81d118f73ba3c50e888ec.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: 981e6f176d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327241
Change-Id: I3f257f5200485cc0c7126376fccfcae6f8315350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions