diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-13 18:48:00 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-13 18:48:00 +0000 |
| commit | f97899a17d683943c659100177432fe60bc0a342 (patch) | |
| tree | e235643c11b6b3d624d976cc93a33d50aa9a2bda | |
| parent | c6b1dff85e6cb5183a75c8b78a40395f6245a306 (diff) | |
| parent | 2ef5514ffb98109944a2660470065e720cc9dfc8 (diff) | |
| download | marlin-kernel-f97899a17d683943c659100177432fe60bc0a342.tar.gz | |
Merge cherrypicks of [6717404, 6717540, 6717405, 6717482, 6717483, 6717484, 6716934, 6717215, 6717485, 6717216] into pi-qpr3-releaseandroid-9.0.0_r37android-9.0.0_r36
Change-Id: Ie0e91cb915b61b02cabcba8c682adb1595621ce4
| -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 | 19125524 -> 19122834 bytes | |||
| -rw-r--r-- | Image.gz-dtb.sailfish_kasan | bin | 19083326 -> 19080636 bytes | |||
| -rw-r--r-- | Image.lz4-dtb | bin | 21119866 -> 21121900 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 218b5a6..a1593e8 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: "5248750" + build_id: "5354703" target: "kernel_kasan" source_file: "Image.gz-dtb.marlin" } dest_file: "Image.gz-dtb.marlin_kasan" - version: "Linux version 3.18.131-g528ac59 (android-build@abfarm339) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Jan 22 02:13:07 UTC 2019" + 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_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 185f640..95e40c4 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: "5248750" + build_id: "5354703" target: "kernel_kasan" source_file: "Image.gz-dtb.sailfish" } dest_file: "Image.gz-dtb.sailfish_kasan" - version: "Linux version 3.18.131-g528ac59 (android-build@abfarm339) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Jan 22 02:13:07 UTC 2019" + 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_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 fb3d68e..202048f 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: "5248750" + build_id: "5354703" target: "kernel" source_file: "Image.lz4-dtb" } dest_file: "Image.lz4-dtb" - version: "Linux version 3.18.131-g528ac59 (android-build@abfarm339) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Jan 22 02:13:07 UTC 2019" + 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_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 dbfc7fd..f1d3f13 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 60dba20..45defb7 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 c579941..ed1e479 100644 --- a/Image.lz4-dtb +++ b/Image.lz4-dtb |