summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 392456dd78 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16emu-31-stable-releaseemu-31-releaseandroid12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: ee4f67da3e -s ours am skip reason: Change-Id I734ea31b9bba113114d23b7572e83ef0233bc6ec with SHA-1 ed820f6df3 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6e99dc1ebd08cc80b661a93ed1a6418ee3ef1e41
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/qemu-kernel" am: ↵Bob Badour
173adbcf85 am: d34faf5927 am: da92760018 Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1588374 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I389599db97fe2906a31aeabc029fcf2014f655f0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 392456dd78 -s oursXin Li
am skip reason: Change-Id I734ea31b9bba113114d23b7572e83ef0233bc6ec with SHA-1 ed820f6df3 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8cea7e44b8b29fa4f1d5f721776422cb0256b6cb
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I734ea31b9bba113114d23b7572e83ef0233bc6ec Change-Id: I16459af8dbef330b1cf789d2f892087cfd4e7e32
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/qemu-kernel" am: ↵Bob Badour
173adbcf85 am: d34faf5927 Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1588374 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iff0331a90afcc23bac94883bbea2668fc5931de7
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/qemu-kernel" am: 173adbcf85Bob Badour
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1588374 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9612a4894991cd657d4fc41e8fc5cdf55d7d5df2
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/qemu-kernel"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/qemu-kernelBob Badour
Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: Android.bp x86/pc-bios/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1f498c8d93743a9a6ae8f002be3539da6b85abe5
2021-02-05Merge "Retire 5.10 kernel prebuils" am: 1e891fca62 am: cea13929a7 am: 1b77c354c2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1576396 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I80d6ede0842a793b737274ecea06fc303eec732b
2021-02-05Merge "Retire 5.10 kernel prebuils" am: 1e891fca62 am: cea13929a7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1576396 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b68a57856009a2ba10ce05a5b2b84698cc910bf
2021-02-05Merge "Retire 5.10 kernel prebuils" am: 1e891fca62Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1576396 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I21c6a4b85a59f46da45a1b3e55de7c86d061257c
2021-02-05Merge "Retire 5.10 kernel prebuils"android-s-preview-1Treehugger Robot
2021-02-04Retire 5.10 kernel prebuilsRoman Kiryanov
they moved to kernel/prebuilts. Bug: 170677468 Test: presubmit Signed-off-by: Roman Kiryanov <rkir@google.com> Change-Id: Id69c52049ba6c541b324b81ee2de7a2d17ff975f
2021-02-04Merge "Fix license_type. GPL" am: 83f776c3c6 am: d17f183333 am: 2c00dd7df1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1573039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0b81a7b766282f1d80867c015a433b51dc478513
2021-02-04Merge "Fix license_type. GPL" am: 83f776c3c6 am: d17f183333Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1573039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9110a8dbdff0b84e8fdacbbc43f7d48762e75410
2021-02-04Merge "Fix license_type. GPL" am: 83f776c3c6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1573039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8081f76644377addc5d094eb9f36d92d648eec76
2021-02-04Merge "Fix license_type. GPL"Treehugger Robot
2021-02-03Fix license_type. GPLBob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Exempt-From-Owner-Approval: janitorial work Change-Id: Ie540388e3531e263bb4fc7c81b0777235eb32438
2021-01-08Merge "Update kernel to builds 7068937 (x86_64)" am: 6355aa6c49 am: ↵Treehugger Robot
2e05840c3b am: 58af6a5860 Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1543225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I788ddd65d3c94b3198f67f5229f61aa453b44797
2021-01-08Merge "Update kernel to builds 7068937 (x86_64)" am: 6355aa6c49 am: 2e05840c3bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1543225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a8c2b13d543e2f45412c980b8eed94ed00e8565
2021-01-08Merge "Update kernel to builds 7068937 (x86_64)" am: 6355aa6c49Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1543225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5703eeda9f024a9bc6cc96e7bcf26491c7295764
2021-01-08Merge "Update kernel to builds 7068937 (x86_64)"Treehugger Robot
2021-01-08Merge "Update kernel to builds 7068937 (aarch64)" am: f6594979ca am: ↵Bo Hu
638b3ba192 am: c9c19a5bd0 Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1543224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8dd5b75ef0886988a4a40b983abca65cc83d0fd8
2021-01-07Merge "Update kernel to builds 7068937 (aarch64)" am: f6594979ca am: 638b3ba192Bo Hu
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1543224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I12c7fca7533937b7361093b374a2f0ea5cbf4b1a
2021-01-07Merge "Update kernel to builds 7068937 (aarch64)" am: f6594979caBo Hu
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1543224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic1f16959f82f98c4b531e1003771cc9c03cbabe3
2021-01-07Merge "Update kernel to builds 7068937 (aarch64)"Bo Hu
2021-01-07Update kernel to builds 7068937 (x86_64)Roman Kiryanov
Test: treehugger Bug: 176985474 Signed-off-by: Roman Kiryanov <rkir@google.com> Change-Id: Ie0e4bfb85d6758a8d5a8938fe13e5e41e40be98c
2021-01-07Update kernel to builds 7068937 (aarch64)Roman Kiryanov
Test: treehugger Bug: 176985474 Change-Id: If3a9e2cfd9d84c32dce94dc80affcf5d4db980d4 Signed-off-by: Roman Kiryanov <rkir@google.com>
2020-12-18Merge "Update kernel to builds 7036823" am: 39ac3693f3 am: 6898416c2c am: ↵Treehugger Robot
ed820f6df3 Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1532037 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia689fc1f9a6cf287913c06e8da6d51041d69387b
2020-12-17Merge "Update kernel to builds 7036823" am: 39ac3693f3 am: 6898416c2cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1532037 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I734ea31b9bba113114d23b7572e83ef0233bc6ec
2020-12-17Merge "Update kernel to builds 7036823" am: 39ac3693f3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1532037 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9fd1cc27e6b52505c926b98a1c87a2a5d772802
2020-12-17Merge "Delete update_54_kernel.sh" am: 42698a6280 am: 255d73bb12 am: e7a2688fd2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1532758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I41815914a1587e3dfd3b0aa44e156d2ecd55a476
2020-12-17Merge "Update kernel to builds 7036823"Treehugger Robot
2020-12-17Merge "Delete update_54_kernel.sh" am: 42698a6280 am: 255d73bb12Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1532758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie86ca39f42dcf3cad87d6ebe0ca7a891639b3be4
2020-12-17Merge "Delete update_54_kernel.sh" am: 42698a6280Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1532758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib3d3d3e28332a8069915fe0f361e5f5c4d37746b
2020-12-17Merge "Delete update_54_kernel.sh"Treehugger Robot
2020-12-17Delete update_54_kernel.shAlistair Delva
Support for updating emulator prebuilts has been added to the kernel/build/gki/download_from_ci script. Bug: 175707513 Change-Id: Id9095c29a4a3a5440ea7a5df5a3dba0415fda48b
2020-12-16Update kernel to builds 7036823Alistair Delva
Initial revision for 5.10. Test: treehugger Bug: 175707513 Change-Id: Ib244a838ff56f1fc558e794b60b2f8d4cbc747e7
2020-11-24Merge "Update kernel prebuilts to aosp_kernel-common-android12-5.4/6983223" ↵Treehugger Robot
am: 286091eeb2 am: 6b5854ee0f am: d263c225be Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1510508 Change-Id: Ia1d4747ab61a6b5f126a194ab913a22c635abc5d
2020-11-24Merge "Update kernel prebuilts to aosp_kernel-common-android12-5.4/6983223" ↵Treehugger Robot
am: 286091eeb2 am: 6b5854ee0f Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1510508 Change-Id: Ia32b952ea6d4e5fc5c548f290defcb231d352663
2020-11-24Merge "Update kernel prebuilts to aosp_kernel-common-android12-5.4/6983223" ↵Treehugger Robot
am: 286091eeb2 Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1510508 Change-Id: I7cc1d4d329c8c33e280560e30624be114bf99421
2020-11-24Merge "Update kernel prebuilts to aosp_kernel-common-android12-5.4/6983223"Treehugger Robot
2020-11-24Update kernel prebuilts to aosp_kernel-common-android12-5.4/6983223Ji Soo Shin
Test: TreeHugger Bug: 162584777 Change-Id: I21e1209c62419fc6876a04958326260914c60d0a Signed-off-by: Ji Soo Shin <jisshin@google.com>
2020-11-24Mark ab/6881855 as merged am: 224d557e58 am: 37cb762442Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/13113090 Change-Id: I9c48ac092d9a59cc8a0d86cb958a60c6156ab7af
2020-11-24Mark ab/6881855 as merged am: 224d557e58Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/13113090 Change-Id: I227c9ebf2e8863d2d68427126c4836da5721a236
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I45552e1c34010fd39a7a2296051264a2fd8adde9
2020-10-29Merge "Update kernel prebuilts to aosp_kernel-common-android12-5.4/6939670" ↵Roman Kiryanov
am: 7f1dc449b9 am: a5eec4208b am: 3da18c6c55 am: 9b82d563d1 Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1480276 Change-Id: Id402f8819d795640ce129e47a4c2e00799d43310
2020-10-29Merge "Update kernel prebuilts to aosp_kernel-common-android12-5.4/6939670" ↵Roman Kiryanov
am: 7f1dc449b9 am: a5eec4208b am: 3da18c6c55 Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1480276 Change-Id: I58d4a045c83a8a88e9f5de8bc88b64e3990c2cdf
2020-10-29Merge "Update kernel prebuilts to aosp_kernel-common-android12-5.4/6939670" ↵Roman Kiryanov
am: 7f1dc449b9 am: a5eec4208b Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1480276 Change-Id: Ibd984eb2898bc2b00aad999a86cf714dba2bbff4
2020-10-29Merge "Update kernel prebuilts to aosp_kernel-common-android12-5.4/6939670" ↵Roman Kiryanov
am: 7f1dc449b9 Original change: https://android-review.googlesource.com/c/platform/prebuilts/qemu-kernel/+/1480276 Change-Id: I389ef802ab163b5c1e776c49bfedae6341a44742
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 16:16:28 +0000