| commit | 5bf99bddc6267af06a09decc19916fc215de96f4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Apr 21 23:53:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 21 23:53:08 2023 +0000 |
| tree | 902fe2d5aa90ebb92c7f8c2198b312d99e6fea4b | |
| parent | d2820058cdad002767ede135b8625f50b623e2b1 [diff] | |
| parent | 3d7438d97009af2990522d8106efeb984c03b99c [diff] |
[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 13ab81edfb -s ours am: cb1a82c510 -s ours am: 335eba20a4 -s ours am: 3d7438d970 -s ours am skip reason: Merged-In I42469df8e8b07221d64e3f8574c4f30110dbda7e with SHA-1 30908e2ef7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/22726124 Change-Id: I741c43268339cf139725ab8a25317e4be44f9571 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>