| commit | 6b4d2bb2b3e850d9ef59b005881c257ff3347e08 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Apr 05 01:22:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 05 01:22:25 2023 +0000 |
| tree | 06c284993deb038571bd45e1ebc1e1f6f9293893 | |
| parent | 8b029c9bed16795b501d0c9f471a9e1ea2a98d65 [diff] | |
| parent | 70409f79f5e37628993434ffe9ed11947396b63a [diff] |
[automerger skipped] Merge "DO NOT MERGE - Cherry-pick two upstream changes" into sc-qpr1-dev am: 70409f79f5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327788 Change-Id: I8ccff938105aa5e226d07038c22f3e6e2937a780 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>