diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2019-06-10 10:22:19 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2019-06-10 10:22:19 -0700 |
commit | d58bdeb1cede8abb7c60534c2be82ec76bf7986e (patch) | |
tree | 32c0005d0e5325bcaf578fb80122d199005c4688 | |
parent | 603e8a49b73d6323115e3fb548f8dde671ae7638 (diff) | |
parent | 413e7be0f696982c030a3b802a4297e8e282e432 (diff) | |
download | marlin-kernel-d58bdeb1cede8abb7c60534c2be82ec76bf7986e.tar.gz |
DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
Bug: 134605042
Change-Id: I6f63d7f9e5673f40f367c08fe74128f5391731a5
-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 | 19122834 -> 19131343 bytes | |||
-rw-r--r-- | Image.gz-dtb.sailfish_kasan | bin | 19080636 -> 19089145 bytes | |||
-rw-r--r-- | Image.lz4-dtb | bin | 21121900 -> 21124448 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 a1593e8..b4401d4 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: "5354703" + build_id: "5465364" target: "kernel_kasan" source_file: "Image.gz-dtb.marlin" } dest_file: "Image.gz-dtb.marlin_kasan" - version: "Linux version 3.18.131-g021e5400cb88 (android-build@wphp1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Mar 6 03:19:07 UTC 2019" + 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_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 95e40c4..34e866f 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: "5354703" + build_id: "5465364" target: "kernel_kasan" source_file: "Image.gz-dtb.sailfish" } dest_file: "Image.gz-dtb.sailfish_kasan" - version: "Linux version 3.18.131-g021e5400cb88 (android-build@wphp1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Mar 6 03:19:07 UTC 2019" + 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_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 202048f..7bbd58c 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: "5354703" + build_id: "5465364" target: "kernel" source_file: "Image.lz4-dtb" } dest_file: "Image.lz4-dtb" - version: "Linux version 3.18.131-g021e5400cb88 (android-build@wphp1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Mar 6 03:19:07 UTC 2019" + 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_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 f1d3f13..96cd71f 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 45defb7..ebb8605 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 ed1e479..7db456b 100644 --- a/Image.lz4-dtb +++ b/Image.lz4-dtb |