[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am: fa85d42dad -s ours
am skip reason: subject contains skip directive
Change-Id: I61fdfe1c4e7f150938548577953bee5ea0bd87c9
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 b4401d4..60446f0 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: "5465364"
+ build_id: "4936746"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "Image.gz-dtb.marlin_kasan"
- version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019"
+ version: "Linux version 3.18.100-g0b6976f (android-build@abfarm677) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Aug 7 00:42:05 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 34e866f..2301ae9 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: "5465364"
+ build_id: "4936746"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "Image.gz-dtb.sailfish_kasan"
- version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019"
+ version: "Linux version 3.18.100-g0b6976f (android-build@abfarm677) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Aug 7 00:42:05 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 7bbd58c..ad2ff2e 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: "5465364"
+ build_id: "5655476"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019"
+ version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..6e9dfee
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ 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-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..858c102
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ 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-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..c50d5a5
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ 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-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..26a7488
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ 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-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..b5c1bb8
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ target: "kernel_kasan"
+ source_file: "Image.gz-dtb.marlin"
+ }
+ dest_file: "debug/Image.gz-dtb.marlin_kasan"
+ version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..2e69399
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ 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-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..4e485e1
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ 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-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..aa4cc9a
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ 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-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..83ca167
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ 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-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 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
new file mode 100644
index 0000000..71bf44c
--- /dev/null
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb
@@ -0,0 +1,11 @@
+drops {
+ android_build_drop {
+ build_id: "5655476"
+ target: "kernel_kasan"
+ source_file: "Image.gz-dtb.sailfish"
+ }
+ dest_file: "debug/Image.gz-dtb.sailfish_kasan"
+ version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019"
+ version_group: "kernel"
+ git_project: "device/google/marlin-kernel"
+}
diff --git a/Image.gz-dtb.kasan b/Image.gz-dtb.kasan
deleted file mode 100644
index 2aa7ccb..0000000
--- a/Image.gz-dtb.kasan
+++ /dev/null
Binary files differ
diff --git a/Image.gz-dtb.marlin_kasan b/Image.gz-dtb.marlin_kasan
deleted file mode 100644
index 96cd71f..0000000
--- a/Image.gz-dtb.marlin_kasan
+++ /dev/null
Binary files differ
diff --git a/Image.gz-dtb.sailfish_kasan b/Image.gz-dtb.sailfish_kasan
deleted file mode 100644
index ebb8605..0000000
--- a/Image.gz-dtb.sailfish_kasan
+++ /dev/null
Binary files differ
diff --git a/Image.gz-dtb.svelte b/Image.gz-dtb.svelte
deleted file mode 100644
index 61540d7..0000000
--- a/Image.gz-dtb.svelte
+++ /dev/null
Binary files differ
diff --git a/Image.lz4-dtb b/Image.lz4-dtb
index 7db456b..ff8b42d 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
new file mode 100644
index 0000000..ae86da0
--- /dev/null
+++ 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
new file mode 100644
index 0000000..f4ef0a9
--- /dev/null
+++ 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
new file mode 100644
index 0000000..e3ee9d1
--- /dev/null
+++ 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
new file mode 100644
index 0000000..b947368
--- /dev/null
+++ 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
new file mode 100644
index 0000000..059540a
--- /dev/null
+++ 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
new file mode 100644
index 0000000..a2664bd
--- /dev/null
+++ 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
new file mode 100644
index 0000000..19c7679
--- /dev/null
+++ 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
new file mode 100644
index 0000000..8646e7e
--- /dev/null
+++ 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
new file mode 100644
index 0000000..d6386df
--- /dev/null
+++ 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
new file mode 100644
index 0000000..bb8017f
--- /dev/null
+++ b/debug/Image.gz-dtb.sailfish_kasan
Binary files differ
