DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I215210db3eaacbf68bf628b651760a5f43e2b581
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 35ea0b2..508ecd4 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: "5179113"
+ build_id: "5226165"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "Image.gz-dtb.marlin_kasan"
- version: "Linux version 3.18.122-g8cf5239d58fd (android-build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 UTC 2018"
+ 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_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 f3677c9..276b451 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: "5179113"
+ build_id: "5226165"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "Image.gz-dtb.sailfish_kasan"
- version: "Linux version 3.18.122-g8cf5239d58fd (android-build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 UTC 2018"
+ 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_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 e1d766a..592b4ac 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: "5179113"
+ build_id: "5226165"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- version: "Linux version 3.18.122-g8cf5239d58fd (android-build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 UTC 2018"
+ 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_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/Image.gz-dtb.marlin_kasan b/Image.gz-dtb.marlin_kasan
index 486c86e..c163f48 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 272bf99..22feb25 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 ba6da08..548989b 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ
