diff options
author | Xin Li <delphij@google.com> | 2023-10-06 11:07:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 11:07:19 +0000 |
commit | e4a6cc6f5bc957b9e282e863832d441c74d71bfa (patch) | |
tree | f42a82395735950100a850c43032f2fb42639c6f /src/pshinter/pshmod.c | |
parent | d5ad1ef20b53fc63369cd16349eb8998883a1605 (diff) | |
parent | 4e7cbecbd6018e31be667f473900224acf904b0c (diff) | |
download | freetype-e4a6cc6f5bc957b9e282e863832d441c74d71bfa.tar.gz |
[automerger skipped] Merge "Merge Android 14" into main am: 8697ac6648 -s ours am: 4c9f1bc92e -s ours am: 695c0c6e9d -s ours am: 4e7cbecbd6 -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: Ib84c3dbc2fd592b578c3aa5da81dd3e46425b86a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/pshinter/pshmod.c')
0 files changed, 0 insertions, 0 deletions