diff options
| author | Xin Li <delphij@google.com> | 2019-05-15 16:55:24 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-05-15 16:55:24 -0700 |
| commit | 603e8a49b73d6323115e3fb548f8dde671ae7638 (patch) | |
| tree | e235643c11b6b3d624d976cc93a33d50aa9a2bda | |
| parent | 76e9337a7802f663451905f6120e1d178ce021dc (diff) | |
| parent | 71de7f7150053a4372bac9b1cd89e4e5885f6321 (diff) | |
| download | marlin-kernel-603e8a49b73d6323115e3fb548f8dde671ae7638.tar.gz | |
DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.android-o-mr1-iot-release-1.0.13
Bug: 132622481
Change-Id: Ia07c069955f50612b6068a004463ec8fb9ef91be
| -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 | 19129600 -> 19122834 bytes | |||
| -rw-r--r-- | Image.gz-dtb.sailfish_kasan | bin | 19087402 -> 19080636 bytes | |||
| -rw-r--r-- | Image.lz4-dtb | bin | 21121575 -> 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 508ecd4..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: "5226165" + build_id: "5354703" target: "kernel_kasan" source_file: "Image.gz-dtb.marlin" } dest_file: "Image.gz-dtb.marlin_kasan" - 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: "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 276b451..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: "5226165" + build_id: "5354703" target: "kernel_kasan" source_file: "Image.gz-dtb.sailfish" } dest_file: "Image.gz-dtb.sailfish_kasan" - 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: "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 592b4ac..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: "5226165" + build_id: "5354703" target: "kernel" source_file: "Image.lz4-dtb" } dest_file: "Image.lz4-dtb" - 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: "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 c163f48..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 22feb25..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 548989b..ed1e479 100644 --- a/Image.lz4-dtb +++ b/Image.lz4-dtb |