commit | 1f768cfe102714c86ac0a77ab4523acc6b18ea4f | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 08:59:45 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 08:59:45 2023 +0000 |
tree | f42a82395735950100a850c43032f2fb42639c6f | |
parent | eb6b2c73bf695e8dd33c181602fb0ad0ff813c5e [diff] | |
parent | e5b985c5ca250e49e4a12999ed4f7ba4efb16a4a [diff] |
[automerger skipped] Merge Android 14 am: 2389c22162 -s ours am: e5b985c5ca -s ours am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318 Change-Id: Icf9fb61cf7d75a4c68194aefafe75055b7af3bcc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>