commit | d5ad1ef20b53fc63369cd16349eb8998883a1605 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 11:01:16 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:01:16 2023 +0000 |
tree | f42a82395735950100a850c43032f2fb42639c6f | |
parent | f84dbdb196ff1b550a9cf26e04551b7f118dcd13 [diff] | |
parent | ecc1a19bf790ee9e2591113caad5f54bc886f206 [diff] |
[automerger skipped] Merge Android 14 am: 2389c22162 -s ours am: e5b985c5ca -s ours am: 1f768cfe10 -s ours am: ecc1a19bf7 -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: I8c209c1b2f4e1b228bc095e318b2b15a1d18133a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>