Merge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195, 5318499, 5317874, 5317875, 5317876, 5318243, 5318244, 5318537, 5318538, 5318539, 5318540, 5318541, 5318542, 5318543, 5318544, 5318545, 5318546, 5315210, 5317756, 5318557, 5318558, 5318559, 5318560, 5318561, 5318339, 5318547, 5318548, 5318549, 5318562, 5318563, 5318564, 5318565, 5318566, 5318172, 5318173, 5318174, 5318550, 5318401, 5318196, 5317889, 5318175, 5318176, 5318577, 5318578, 5318579, 5318580, 5318581, 5318503, 5318390, 5318505, 5318341, 5318551] into pi-qpr1-release
Change-Id: Ia2bdb3d1365435db105dda389a6c41d0ebdd99d5
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 90008d5..4adf72f 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: "4999379"
+ build_id: "5065812"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "Image.gz-dtb.marlin_kasan"
- 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: "Linux version 3.18.100-g4212e6b8dac5 (android-build@wprh2.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Oct 12 17:43:29 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 b34f302..ff6e50c 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: "4999379"
+ build_id: "5065812"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "Image.gz-dtb.sailfish_kasan"
- 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: "Linux version 3.18.100-g4212e6b8dac5 (android-build@wprh2.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Oct 12 17:43:29 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 d56de27..0b1b664 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: "4999379"
+ build_id: "5065812"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- 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: "Linux version 3.18.100-g4212e6b8dac5 (android-build@wprh2.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Oct 12 17:43:29 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
index b1be3cd..7c2959d 100644
--- a/Image.gz-dtb.marlin_kasan
+++ b/Image.gz-dtb.marlin_kasan
Binary files differ
diff --git a/Image.gz-dtb.sailfish_kasan b/Image.gz-dtb.sailfish_kasan
index 7878d44..9f2ea1b 100644
--- a/Image.gz-dtb.sailfish_kasan
+++ b/Image.gz-dtb.sailfish_kasan
Binary files differ
diff --git a/Image.lz4-dtb b/Image.lz4-dtb
index e37009e..da2142e 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ
