| commit | 9956f7e12ee2d44da29acd8b4d9af4da2ff4bbb6 | [log] [tgz] |
|---|---|---|
| author | Werner Lemberg <wl@gnu.org> | Wed Apr 05 03:37:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 05 03:37:07 2023 +0000 |
| tree | 234ad317e206c974e924b6e8391f37f236de846a | |
| parent | 4513587721c25f7e09d6237fdb3be9b6524d5447 [diff] | |
| parent | 0088eb95d8660cb7945b9ec8120b8cbe44611f20 [diff] |
[automerger skipped] DO NOT MERGE - Cherry-pick two upstream changes am: b0f8930701 -s ours am: 9ee0f20aa3 -s ours am: e8f1927353 -s ours am: 8d0d653833 -s ours am: 3df79e7e4e -s ours am: 0088eb95d8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327786 Change-Id: I7641d367d9bdf3ab487c85a901f8a4ca70d46a9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>