Merge cherrypicks of [9200581, 9200376, 9200474, 9200583, 9200491, 9200584, 9200505, 9200585, 9200475, 9200586, 9200476, 9200588, 9200589, 9200639] into qt-release
Change-Id: I463d0e1b8d698c42046342517290bde7de9307dc
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb
index 4bd527a..85a392e 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: "5723540"
+ build_id: "5795593"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb
index c44c4bd..9d92f16 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_debug_api"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_debug_api"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb
index 8e221b3..5badd21 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_debug_hang"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_debug_hang"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb
index a2d1556..b49db8c 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_debug_locking"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_debug_locking"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb
index f5e2ecf..48d2812 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_debug_memory"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_debug_memory"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb
index 05884ca..ec2c867 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_kasan"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb
index 593e016..d4839e4 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_debug_api"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_debug_api"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb
index 2bbd6af..162076a 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_debug_hang"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_debug_hang"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb
index 9be032f..bfddcf8 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_debug_locking"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_debug_locking"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb
index c534f36..45c91fc 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_debug_memory"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_debug_memory"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb
index 22d05f9..bc20fa2 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5723540"
+ build_id: "5795593"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_kasan"
- version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019"
+ version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/Image.lz4-dtb b/Image.lz4-dtb
index abbc8e6..6a74c50 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_api b/debug/Image.gz-dtb.marlin_debug_api
index f20f407..04d1616 100644
--- a/debug/Image.gz-dtb.marlin_debug_api
+++ b/debug/Image.gz-dtb.marlin_debug_api
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_hang b/debug/Image.gz-dtb.marlin_debug_hang
index fbcd54b..b64ce17 100644
--- a/debug/Image.gz-dtb.marlin_debug_hang
+++ b/debug/Image.gz-dtb.marlin_debug_hang
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_locking b/debug/Image.gz-dtb.marlin_debug_locking
index 77f4865..df2e5fd 100644
--- a/debug/Image.gz-dtb.marlin_debug_locking
+++ b/debug/Image.gz-dtb.marlin_debug_locking
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_memory b/debug/Image.gz-dtb.marlin_debug_memory
index eaaa422..a6986e9 100644
--- a/debug/Image.gz-dtb.marlin_debug_memory
+++ b/debug/Image.gz-dtb.marlin_debug_memory
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_kasan b/debug/Image.gz-dtb.marlin_kasan
index 47a2d70..0bc8329 100644
--- a/debug/Image.gz-dtb.marlin_kasan
+++ b/debug/Image.gz-dtb.marlin_kasan
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_api b/debug/Image.gz-dtb.sailfish_debug_api
index d2d8537..1fbfc4b 100644
--- a/debug/Image.gz-dtb.sailfish_debug_api
+++ b/debug/Image.gz-dtb.sailfish_debug_api
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_hang b/debug/Image.gz-dtb.sailfish_debug_hang
index 3bec342..59af8d9 100644
--- a/debug/Image.gz-dtb.sailfish_debug_hang
+++ b/debug/Image.gz-dtb.sailfish_debug_hang
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_locking b/debug/Image.gz-dtb.sailfish_debug_locking
index 012b01e..dd7ccdd 100644
--- a/debug/Image.gz-dtb.sailfish_debug_locking
+++ b/debug/Image.gz-dtb.sailfish_debug_locking
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_memory b/debug/Image.gz-dtb.sailfish_debug_memory
index b2f4d7d..043d42b 100644
--- a/debug/Image.gz-dtb.sailfish_debug_memory
+++ b/debug/Image.gz-dtb.sailfish_debug_memory
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_kasan b/debug/Image.gz-dtb.sailfish_kasan
index 44f8787..6389cab 100644
--- a/debug/Image.gz-dtb.sailfish_kasan
+++ b/debug/Image.gz-dtb.sailfish_kasan
Binary files differ
