summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-11-15 18:21:09 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-11-15 18:21:09 +0000
commit752bbccab029ae19e4d0c02ac93af484fdce29ec (patch)
treeaaffe4fe16f30f9e10a87fcbd8417238e81e83f7
parent6d65e858bea4ff4a3c7dfdd8559866de0399a034 (diff)
parenta0eecac574b96e6904d448d589827c2897257c48 (diff)
downloadmarlin-kernel-752bbccab029ae19e4d0c02ac93af484fdce29ec.tar.gz
Merge cherrypicks of [5532243, 5532244, 5532245, 5532246, 5532247, 5532826, 5530552, 5532902, 5530553, 5531520, 5532903, 5530554, 5529581, 5529582, 5531521, 5532979, 5532999, 5532248, 5531522, 5531523, 5531524, 5531525, 5531526, 5529583, 5529584, 5529585, 5529586, 5531351, 5529632, 5530506, 5530507, 5532980, 5533000] into pi-qpr1-releaseandroid-9.0.0_r30pie-qpr1-release
Change-Id: I5f2f46b0bfb27a361f47fc6544e596d314445d2c
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb4
-rw-r--r--Image.gz-dtb.marlin_kasanbin19125442 -> 19124671 bytes
-rw-r--r--Image.gz-dtb.sailfish_kasanbin19083244 -> 19082473 bytes
-rw-r--r--Image.lz4-dtbbin21115517 -> 21115963 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 4adf72f..f40c7d8 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: "5065812"
+ build_id: "5121673"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "Image.gz-dtb.marlin_kasan"
- 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: "Linux version 3.18.100-g16330f2b38aa (android-build@wprc4.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 9 16:19:21 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 ff6e50c..455bb13 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: "5065812"
+ build_id: "5121673"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "Image.gz-dtb.sailfish_kasan"
- 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: "Linux version 3.18.100-g16330f2b38aa (android-build@wprc4.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 9 16:19:21 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 0b1b664..f56cec2 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: "5065812"
+ build_id: "5121673"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- 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: "Linux version 3.18.100-g16330f2b38aa (android-build@wprc4.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 9 16:19:21 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 7c2959d..1d2933c 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 9f2ea1b..de843e1 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 da2142e..15258f6 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ