| commit | 300e8f803400b99b3c72484ce4400b6620eb2778 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Apr 05 01:53:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 05 01:53:34 2023 +0000 |
| tree | 234ad317e206c974e924b6e8391f37f236de846a | |
| parent | 3130faa0720057cd5b29bc57d1331c42eb987ae4 [diff] | |
| parent | 5beac33a5eb5a6f0eb384c94c998fe8e62f8fb00 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Cherry-pick two upstream changes" into sc-qpr1-dev am: 70409f79f5 -s ours am: 6b4d2bb2b3 -s ours am: f6a122df4f -s ours am: 5beac33a5e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22327788 Change-Id: I973e70bb55748151b1df17dbb5f829c8411a4547 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>