diff options
| author | Bill Yi <byi@google.com> | 2018-11-28 18:45:54 -0800 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2018-11-28 18:45:54 -0800 |
| commit | f22adba08eb2ac0de84e542aef31147e142c16f6 (patch) | |
| tree | 2484978dfcc6f157d6f1e3fa68f67951cf6b7e52 | |
| parent | 20553bea2a94e1beb09850cb7841cc29f32d04c6 (diff) | |
| parent | 0c6103c0637aef65abac997a1d16a3c14028fc71 (diff) | |
| download | marlin-kernel-f22adba08eb2ac0de84e542aef31147e142c16f6.tar.gz | |
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: I9386dcafaf6ab05766df03ecbaaf9cc8b01f69e0
| -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 | 19123224 -> 19125675 bytes | |||
| -rw-r--r-- | Image.gz-dtb.sailfish_kasan | bin | 19081026 -> 19083477 bytes | |||
| -rw-r--r-- | Image.lz4-dtb | bin | 21115974 -> 21116960 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 37c110c..90008d5 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: "4956766" + build_id: "4999379" target: "kernel_kasan" source_file: "Image.gz-dtb.marlin" } dest_file: "Image.gz-dtb.marlin_kasan" - version: "Linux version 3.18.100-g2513d23 (android-build@abfarm318) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Aug 15 21:24:02 UTC 2018" + version: "Linux version 3.18.100-g857a9c8f (android-build@abfarm339) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 7 22:27:15 UTC 2018" 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 ab48394..b34f302 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: "4956766" + build_id: "4999379" target: "kernel_kasan" source_file: "Image.gz-dtb.sailfish" } dest_file: "Image.gz-dtb.sailfish_kasan" - version: "Linux version 3.18.100-g2513d23 (android-build@abfarm318) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Aug 15 21:24:02 UTC 2018" + version: "Linux version 3.18.100-g857a9c8f (android-build@abfarm339) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 7 22:27:15 UTC 2018" 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 f41e5a2..d56de27 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: "4956766" + build_id: "4999379" target: "kernel" source_file: "Image.lz4-dtb" } dest_file: "Image.lz4-dtb" - version: "Linux version 3.18.100-g2513d23 (android-build@abfarm318) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Aug 15 21:24:02 UTC 2018" + version: "Linux version 3.18.100-g857a9c8f (android-build@abfarm339) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 7 22:27:15 UTC 2018" 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 6d58129..b1be3cd 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 057a2bf..7878d44 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 2c11699..e37009e 100644 --- a/Image.lz4-dtb +++ b/Image.lz4-dtb |