summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-03-13 21:01:25 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-03-13 21:01:25 +0000
commit064cd4dd780772d7f0addcbf7a1c6252a5d4f824 (patch)
tree446d7f42ae27cd179a9446c3e4b0ec2cc35cd6db
parent5c9d37d5ef350104b311d14b80b869355e75631f (diff)
parentb8ddf4c407d5cf5d5d4ca2d3c7468865a904073c (diff)
downloaddragon-kernel-064cd4dd780772d7f0addcbf7a1c6252a5d4f824.tar.gz
Merge cherrypicks of [6717827, 6718404, 6717829] into oc-m8-releaseandroid-8.1.0_r64
Change-Id: Ic3da47a7552503349eb8d6ccbd4e7c56830c0ddb
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_fit.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_fit_kasan.asciipb4
-rw-r--r--Image.fitbin7828276 -> 7827916 bytes
-rw-r--r--Image.fit.kasanbin12917612 -> 12917524 bytes
4 files changed, 4 insertions, 4 deletions
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_fit.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_fit.asciipb
index 79799b1..faf2213 100644
--- a/.prebuilt_info/kernel/prebuilt_info_Image_fit.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_Image_fit.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5220936"
+ build_id: "5340105"
target: "kernel"
source_file: "Image.fit"
}
dest_file: "Image.fit"
- version: "Linux version 3.18.0-g8cfcede21d2 (android-build@wphq4.hot.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Thu Jan 10 02:54:55 UTC 2019"
+ version: "Linux version 3.18.0-gbb7cae67567 (android-build@wprn11.hot.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Feb 27 08:35:18 UTC 2019"
version_group: "kernel"
git_project: "device/google/dragon-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_fit_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_fit_kasan.asciipb
index bd0edba..813f7dc 100644
--- a/.prebuilt_info/kernel/prebuilt_info_Image_fit_kasan.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_Image_fit_kasan.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5220936"
+ build_id: "5340105"
target: "kernel_kasan"
source_file: "Image.fit"
}
dest_file: "Image.fit.kasan"
- version: "Linux version 3.18.0-g8cfcede21d2 (android-build@wphq4.hot.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Thu Jan 10 02:54:55 UTC 2019"
+ version: "Linux version 3.18.0-gbb7cae67567 (android-build@wprn11.hot.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Feb 27 08:35:18 UTC 2019"
version_group: "kernel"
git_project: "device/google/dragon-kernel"
}
diff --git a/Image.fit b/Image.fit
index 9319a34..7cd9f8b 100644
--- a/Image.fit
+++ b/Image.fit
Binary files differ
diff --git a/Image.fit.kasan b/Image.fit.kasan
index 25edc3e..02c6e60 100644
--- a/Image.fit.kasan
+++ b/Image.fit.kasan
Binary files differ