commit | 56b452f0be399bdf373e6f0f8210ffb2c933bf56 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 15 00:08:56 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 15 00:08:56 2023 +0000 |
tree | 902fe2d5aa90ebb92c7f8c2198b312d99e6fea4b | |
parent | 143b806248a2ce1d6e732f8865e6ea11a1ebfaa6 [diff] | |
parent | 3082fe7c41cd7428f95396593e87522a47a678c1 [diff] |
[automerger skipped] Merge "Merge Android 13 QPR2" am: 6d669f96f2 -s ours am: dcc3925b11 -s ours am: 3082fe7c41 -s ours am skip reason: Merged-In I2b60b477495b444fa64722a9a78586839f25c3d9 with SHA-1 b56d29a0a6 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2486787 Change-Id: I2ef557ded822d5c0d788ee4d84736636fde0b728 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>