aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from 61c2a5111a20c36749145d9670b10bf1cbcc9398 to ↵aml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-releaseAndroid Build Coastguard Worker
mainline-conscrypt-release Change-Id: I56f38f4b42b2fe3a67ab9931eee77b5cf6a61b8c
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am: 36281cb07a -s ours am: 3f09227bb0 -s ours am: 5acd2224e3 -s ours am: bdb2be6dfd -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I730381e3f192e8f001225f899661d8693512c931 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am: ecaaa4add6 -s ours am: 9ca0c8043c -s ours am: 371e3c02ae -s ours am: 8eadb674ea -s ours am: 4b9539b348 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I6497e8177aacd561b94fe9ba1e95c020ed2da554 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am: 36281cb07a -s ours am: 22e3a2d750 -s ours am: 8597edbff7 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I10130681e7148ad5540d6620fd1d83671ce5e930 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am: ecaaa4add6 -s ours am: 9ca0c8043c -s ours am: d9eddcfc91 -s ours am: fdf92484fa -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: Ife2656f81e28941635f9f8b5cfe3028d0c3793b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵android14-devTreehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am: 36281cb07a -s ours am: 3f09227bb0 -s ours am: 5acd2224e3 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I5217dd9e1807750daa8d84cda5ad7090784819de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am: ecaaa4add6 -s ours am: 9ca0c8043c -s ours am: 371e3c02ae -s ours am: 8eadb674ea -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I8933262be0c2713eed6cf034322491480bdf24eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am: 36281cb07a -s ours am: 3f09227bb0 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I65a9bbdfd74e1e1032ceee5588589638d93f4d50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am: ecaaa4add6 -s ours am: 9ca0c8043c -s ours am: 371e3c02ae -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I72e59a7bc00ac709c08e3ed9b414dcc06261d7f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am: 36281cb07a -s ours am: 22e3a2d750 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I69e28e20670d7d586f57fffc912c42cdde36e926 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am: ecaaa4add6 -s ours am: 9ca0c8043c -s ours am: d9eddcfc91 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I89c9e204cf5cb46c81f2a3d21c7cadc06f25d050 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am: 36281cb07a -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I0123d73403ab8f6b444875c739b4ae664d6b7126 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am: ecaaa4add6 -s ours am: 9ca0c8043c -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I11b23169c78adb94b88ec0146857dafed54618f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am: 36281cb07a -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I7a9fe7f56c844686e08dbb8423f45e1c41af9087 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am: ecaaa4add6 -s ours am: 9ca0c8043c -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: If6df35263e57b91d524f8f6848d44999381e4827 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am: ece04aac11 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I508648254535ed38219d924bb7959af18d91a3a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am: ecaaa4add6 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I92e6eda1c10a5edeeba849c5af9128b5a7af8198 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am: c8e5922225 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: Ide38b82233638019b05215160829b0291b0699fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am: 5e09f4afca -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: If2bd44dba03c21a9037357dae985403c7632f36a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am: 892c89dad4 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I283e54cff5a682b048d7140b9591949e184d5d6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s ↵Seigo Nonaka
ours am: d8bb30619c -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: Ie8a2981af719132985be7fd076efd02aec6b5f17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Merge "Cherrypick following three changes" into ↵Treehugger Robot
rvc-qpr-dev am: ab67101200 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I52853fbc479323f27c882ab02688563ea1f3331e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23[automerger skipped] Cherrypick following three changes am: 18e1102d6d -s oursSeigo Nonaka
am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 8d63b0bfcb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23078033 Change-Id: I8bd48d3425c74e75cc3f08dd21dc68ed1496ea19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23Merge "Cherrypick following three changes" into rvc-qpr-devTreehugger Robot
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am: 615e8558f1 -s ours am: f128616796 -s ours am: 8483e21a1f -s ours am: f927f8f0b8 -s ours am: 6823887f82 -s ours am: f435f81ff3 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: Id9185fa7a533533fdb40591e78fa25f1050246e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am: 615e8558f1 -s ours am: f128616796 -s ours am: 8483e21a1f -s ours am: d7060694c7 -s ours am: d1ee34d038 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: If74f997a4b419142f9bb62234e7611754909cf32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am: 615e8558f1 -s ours am: f128616796 -s ours am: 8483e21a1f -s ours am: f927f8f0b8 -s ours am: 6823887f82 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: I766306e1c419e0fd5197499d0bc04bb116ca7243 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am: 615e8558f1 -s ours am: f128616796 -s ours am: 8483e21a1f -s ours am: f927f8f0b8 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: I1c2d5a884293812fd87325f9ef13b23617239bf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am: 615e8558f1 -s ours am: f128616796 -s ours am: 8483e21a1f -s ours am: d7060694c7 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: Ie2878a1d6a5bd9ebb11e0a5df37a75701f7987fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am: 615e8558f1 -s ours am: f128616796 -s ours am: 8483e21a1f -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: I9ff95c924cb5d9af2f74780d65b3290e2a506be3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am: 615e8558f1 -s ours am: f128616796 -s ours am: 8483e21a1f -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: I6a0d97c9e8952d86d84f032a65f38f4632bbc466 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am: 615e8558f1 -s ours am: f128616796 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: I49e2dc128b0685c09b2bfd9ef3233a0b337e0fcc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am: 615e8558f1 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: Id2ce469de95216b03faab331ff77b3797beafe37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am: 9b0e6629a2 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: I481d491d3289b10141f2c175719fb5fd9a3cc52d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19[automerger skipped] Cherrypick following three changes am: 8d63b0bfcb am: ↵Seigo Nonaka
ece57fef04 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 b0d165057a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: I5fa1cb6007fb45426875ebaf19a098df5dc615e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Cherrypick following three changes am: 8d63b0bfcbSeigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077068 Change-Id: I4b1c693486ce2e0f52390be1be96bd339d39b418 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"cherrypicker-L20400000960493922:N05100001366057571" into sc-qpr1-dev am: 0cdaa6a4b5 -s ours am: 695d16f58f -s ours am: d20a3ca362 -s ours am: 9e1fb337f2 -s ours am: c97f829824 -s ours am: 6ca43d9c1d -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: Ib66dd7043ebb5e6eee0b381b8eae8ec98810be18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] [automerge] Cherrypick following three changes 2p: ↵Seigo Nonaka
b0d165057a am: 34fc79aee7 -s ours am: 562729984b -s ours am: e28b316a06 -s ours am: 2661925a58 -s ours am: 2c84e62504 -s ours am: 7c80ad91fd -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: Ib43430a37eba7f6914b6d9cdb61ef6d6be5f0e21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"cherrypicker-L20400000960493922:N05100001366057571" into sc-qpr1-dev am: 0cdaa6a4b5 -s ours am: 695d16f58f -s ours am: d20a3ca362 -s ours am: 9e1fb337f2 -s ours am: c97f829824 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: Ib7f608fd981bdff07293b603d7f777ee3ac8e910 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] [automerge] Cherrypick following three changes 2p: ↵Seigo Nonaka
b0d165057a am: 34fc79aee7 -s ours am: 562729984b -s ours am: e28b316a06 -s ours am: 2661925a58 -s ours am: 2c84e62504 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: Ic5dcab73afa85a0b06b6dad64cfa89f0695f3f24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"cherrypicker-L20400000960493922:N05100001366057571" into sc-qpr1-dev am: 0cdaa6a4b5 -s ours am: 695d16f58f -s ours am: d20a3ca362 -s ours am: 39c14084c2 -s ours am: 50a3fdb77f -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: I4561f62fe557eeeb943b9b1c020feae246211a0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] [automerge] Cherrypick following three changes 2p: ↵Seigo Nonaka
b0d165057a am: 34fc79aee7 -s ours am: 562729984b -s ours am: e28b316a06 -s ours am: 228fc22c9d -s ours am: 7c2fa6868d -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: I5e20ef1c7160cbe3477f2cc6f3a02707f44c2954 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"cherrypicker-L20400000960493922:N05100001366057571" into sc-qpr1-dev am: 0cdaa6a4b5 -s ours am: 695d16f58f -s ours am: d20a3ca362 -s ours am: 9e1fb337f2 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: Id30e5e17f027a7686bf6edf7d849d7e6ecff5ad9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] [automerge] Cherrypick following three changes 2p: ↵Seigo Nonaka
b0d165057a am: 34fc79aee7 -s ours am: 562729984b -s ours am: e28b316a06 -s ours am: 2661925a58 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: I1f0484b8fdd3c2348ef89588cb090c150b1cd074 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"cherrypicker-L20400000960493922:N05100001366057571" into sc-qpr1-dev am: 0cdaa6a4b5 -s ours am: 695d16f58f -s ours am: d20a3ca362 -s ours am: 39c14084c2 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: I63809feb66079e846e57b6a8ed325f9bb4b5c77e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] [automerge] Cherrypick following three changes 2p: ↵Seigo Nonaka
b0d165057a am: 34fc79aee7 -s ours am: 562729984b -s ours am: e28b316a06 -s ours am: 228fc22c9d -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: I5f2f8f7594c2476c51479a97049c2a46971f9a77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"cherrypicker-L20400000960493922:N05100001366057571" into sc-qpr1-dev am: 0cdaa6a4b5 -s ours am: 695d16f58f -s ours am: d20a3ca362 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: I9cb87b790a5beab59b4404e0bd33c447c35a434b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] [automerge] Cherrypick following three changes 2p: ↵Seigo Nonaka
b0d165057a am: 34fc79aee7 -s ours am: 562729984b -s ours am: e28b316a06 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: Iffa93fb349797175dfd72137d0ac57c5428f13c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"cherrypicker-L20400000960493922:N05100001366057571" into sc-qpr1-dev am: 0cdaa6a4b5 -s ours am: 695d16f58f -s ours am: d20a3ca362 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: I833d29bfa62c8a2727bb55e48564fd7ebf43e2e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13[automerger skipped] [automerge] Cherrypick following three changes 2p: ↵Seigo Nonaka
b0d165057a am: 34fc79aee7 -s ours am: 562729984b -s ours am: e28b316a06 -s ours am skip reason: Merged-In I7e839b2a36e35c27974a82cc76e853996a7c7688 with SHA-1 a45c6a1cf3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/23077071 Change-Id: Iab40ea31cf819529c39175b7d54e3e13cdfc7a7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 10:50:19 +0000