commit | 8bc20bcd29162c3865cea1eaeece78d3f31698da | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 12 06:25:21 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 12 06:25:21 2023 +0000 |
tree | 20675215494af58053a383e6cfcb82e597490dcd | |
parent | ce22592d9e74d5bb53a7cd2e0803812469b6936a [diff] | |
parent | 16547fda47ea7f52ee50eafd01c62d608765e8fb [diff] |
[automerger skipped] Merge "Cherrypick following three changes" into sc-v2-dev am: 02a12c7180 -s ours am: 16547fda47 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 cff127c5bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078034 Change-Id: Ia452c902c9adbb422904c0f8727837f91328e1a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>