commit | 3df79e7e4e45a8e8d53ed8697c0a6d7ba1468124 | [log] [tgz] |
---|---|---|
author | Werner Lemberg <wl@gnu.org> | Wed Apr 05 02:37:30 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 05 02:37:30 2023 +0000 |
tree | 06c284993deb038571bd45e1ebc1e1f6f9293893 | |
parent | 981e6f176dedfc8935e09d8101bec872d7a76e54 [diff] | |
parent | 8d0d653833a854d95189b114048bb40a8e5f25c6 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327786 Change-Id: I652e1f530386680a9f12e89b5bbe513966feb10f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>