| commit | 3130faa0720057cd5b29bc57d1331c42eb987ae4 | [log] [tgz] |
|---|---|---|
| author | Werner Lemberg <wl@gnu.org> | Wed Apr 05 01:53:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 05 01:53:33 2023 +0000 |
| tree | 234ad317e206c974e924b6e8391f37f236de846a | |
| parent | 0b4238960d68bc2b3c6f1c54eea0e6688c0f3e41 [diff] | |
| parent | c34b4862c8ba35cf0ebf4fd5a2d8ebc53e79008b [diff] |
[automerger skipped] DO NOT MERGE - Cherry-pick two upstream changes am: 461bda5b36 -s ours am: 8b029c9bed -s ours am: 409b98e37a -s ours am: c34b4862c8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327788 Change-Id: I7b8aa09642c4550294600cb59ad17989cc12c2f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>