commit | 81ec8a940531de120c415a5b0b2404aeeeac1b33 | [log] [tgz] |
---|---|---|
author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | Wed Apr 05 01:22:15 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 05 01:22:15 2023 +0000 |
tree | 06c284993deb038571bd45e1ebc1e1f6f9293893 | |
parent | fa4a08921a89b20389b2e61d8817858d4bca291c [diff] | |
parent | 676c1dfb703f4ba58653d175ed10edd0933e0a4a [diff] |
[automerger skipped] [automerge] DO NOT MERGE - Cherry-pick two upstream changes 2p: 470a3e6a1e am: 676c1dfb70 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327787 Change-Id: I0b3eec775b923b5bfb43e8bd96e1869dcc80f9fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>