diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-16 23:03:19 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-16 23:03:19 +0000 |
commit | 7bbd9ea92c2a2f7492102a4fefc01d4cd7d54098 (patch) | |
tree | cd3548a784ff425aeba40b66d0b8808e3ea7c08e | |
parent | 5c49caf28b21b197f43493b01378865c97c6def8 (diff) | |
parent | b0054f4046e9163c18d06cb5c20d52ec67ad7656 (diff) | |
download | marlin-kernel-7bbd9ea92c2a2f7492102a4fefc01d4cd7d54098.tar.gz |
Merge cherrypicks of [6075307, 6073318, 6074866, 6074892, 6072458, 6075067, 6075068, 6075069, 6075250, 6075218] into pi-qpr2-releaseandroid-9.0.0_r35android-9.0.0_r34pie-qpr2-release
Change-Id: Iffa403f8452179036ef0c4672071fd43a88a551e
-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 | 19128327 -> 19129600 bytes | |||
-rw-r--r-- | Image.gz-dtb.sailfish_kasan | bin | 19086129 -> 19087402 bytes | |||
-rw-r--r-- | Image.lz4-dtb | bin | 21123912 -> 21121575 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 35ea0b2..508ecd4 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: "5179113" + build_id: "5226165" target: "kernel_kasan" source_file: "Image.gz-dtb.marlin" } dest_file: "Image.gz-dtb.marlin_kasan" - version: "Linux version 3.18.122-g8cf5239d58fd (android-build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 UTC 2018" + version: "Linux version 3.18.122-g665c9a1 (android-build@abfarm338) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 11 21:46:31 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 f3677c9..276b451 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: "5179113" + build_id: "5226165" target: "kernel_kasan" source_file: "Image.gz-dtb.sailfish" } dest_file: "Image.gz-dtb.sailfish_kasan" - version: "Linux version 3.18.122-g8cf5239d58fd (android-build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 UTC 2018" + version: "Linux version 3.18.122-g665c9a1 (android-build@abfarm338) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 11 21:46:31 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 e1d766a..592b4ac 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: "5179113" + build_id: "5226165" target: "kernel" source_file: "Image.lz4-dtb" } dest_file: "Image.lz4-dtb" - version: "Linux version 3.18.122-g8cf5239d58fd (android-build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 UTC 2018" + version: "Linux version 3.18.122-g665c9a1 (android-build@abfarm338) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 11 21:46:31 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 486c86e..c163f48 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 272bf99..22feb25 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 ba6da08..548989b 100644 --- a/Image.lz4-dtb +++ b/Image.lz4-dtb |