diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-14 19:53:37 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-14 19:53:37 +0000 |
| commit | 65df6340c3cfc5b942eba8249b45a57ca29dfd9f (patch) | |
| tree | fb85034de739482a0d1466fdc725eca6ae92a3d6 | |
| parent | 5a65944a54d138e5690e75bfd0290f86e930c02e (diff) | |
| parent | 519251506285201ab749075565411d4a44d37caf (diff) | |
| download | marlin-kernel-65df6340c3cfc5b942eba8249b45a57ca29dfd9f.tar.gz | |
Merge cherrypicks of [7508933, 7508817, 7509318, 7508934, 7509262, 7509263, 7509264, 7508935, 7508630, 7508631, 7508632, 7508633, 7508634, 7509319, 7508937, 7508841, 7509320, 7508842] into pi-qpr3-releaseandroid-9.0.0_r46android-9.0.0_r44android-9.0.0_r43pie-qpr3-release
Change-Id: I18d2b02e5c50460fce67f4cf09530ba6569d63ea
| -rw-r--r-- | .prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb | 4 | ||||
| -rw-r--r-- | .prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb | 4 | ||||
| -rw-r--r-- | .prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb | 4 | ||||
| -rw-r--r-- | Image.gz-dtb.marlin_kasan | bin | 19131343 -> 19128073 bytes | |||
| -rw-r--r-- | Image.gz-dtb.sailfish_kasan | bin | 19089145 -> 19085875 bytes | |||
| -rw-r--r-- | Image.lz4-dtb | bin | 21124448 -> 21124264 bytes |
6 files changed, 6 insertions, 6 deletions
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb index b4401d4..c725397 100644 --- a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5465364" + build_id: "5555601" target: "kernel_kasan" source_file: "Image.gz-dtb.marlin" } dest_file: "Image.gz-dtb.marlin_kasan" - version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019" + version: "Linux version 3.18.131-ga2426c4f8f23 (android-build@wprn6.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri May 10 20:32:26 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb index 34e866f..f894ad9 100644 --- a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5465364" + build_id: "5555601" target: "kernel_kasan" source_file: "Image.gz-dtb.sailfish" } dest_file: "Image.gz-dtb.sailfish_kasan" - version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019" + version: "Linux version 3.18.131-ga2426c4f8f23 (android-build@wprn6.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri May 10 20:32:26 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb index 7bbd58c..50e3a62 100644 --- a/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5465364" + build_id: "5555601" target: "kernel" source_file: "Image.lz4-dtb" } dest_file: "Image.lz4-dtb" - version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019" + version: "Linux version 3.18.131-ga2426c4f8f23 (android-build@wprn6.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri May 10 20:32:26 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/Image.gz-dtb.marlin_kasan b/Image.gz-dtb.marlin_kasan Binary files differindex 96cd71f..6d84afc 100644 --- a/Image.gz-dtb.marlin_kasan +++ b/Image.gz-dtb.marlin_kasan diff --git a/Image.gz-dtb.sailfish_kasan b/Image.gz-dtb.sailfish_kasan Binary files differindex ebb8605..df7ec2b 100644 --- a/Image.gz-dtb.sailfish_kasan +++ b/Image.gz-dtb.sailfish_kasan diff --git a/Image.lz4-dtb b/Image.lz4-dtb Binary files differindex 7db456b..21d0a61 100644 --- a/Image.lz4-dtb +++ b/Image.lz4-dtb |