aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2020-09-23 03:36:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-23 03:36:30 +0000
commitf440e8e90fea8112be119dae85c1d015ef59f8a6 (patch)
tree6261efb054dfb209a3c88ce9829112d38da6bfa0
parent6c6cd71d67d1ffd86df1e160dee8ccf04c860108 (diff)
parentf735ca427b9e4392d96bf5263ee71941caac8149 (diff)
downloadconfigs-android11-mainline-os-statsd-release.tar.gz
resolve merge conflicts of 0c0ce4d223c78d2d333f2fc71af52fbe6cba507e to qt-dev am: 1d2f6e2ec5 am: a75f17bb43 am: f735ca427bandroid-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-release
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/12663729 Change-Id: I4909d3c98bdd8f9f409eedb57d4760b82f7ca403
-rw-r--r--o-mr1/android-3.18/android-base.config1
-rw-r--r--o-mr1/android-4.4/android-base.config1
-rw-r--r--o-mr1/android-4.9/android-base.config1
-rw-r--r--o/android-3.18/android-base.config1
-rw-r--r--o/android-4.4/android-base.config1
-rw-r--r--o/android-4.9/android-base.config1
6 files changed, 0 insertions, 6 deletions
diff --git a/o-mr1/android-3.18/android-base.config b/o-mr1/android-3.18/android-base.config
index 6238a1e..7eb1e71 100644
--- a/o-mr1/android-3.18/android-base.config
+++ b/o-mr1/android-3.18/android-base.config
@@ -11,7 +11,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o-mr1/android-4.4/android-base.config b/o-mr1/android-4.4/android-base.config
index b20728c..f987f24 100644
--- a/o-mr1/android-4.4/android-base.config
+++ b/o-mr1/android-4.4/android-base.config
@@ -11,7 +11,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o-mr1/android-4.9/android-base.config b/o-mr1/android-4.9/android-base.config
index 4a47d8e..88fd01d 100644
--- a/o-mr1/android-4.9/android-base.config
+++ b/o-mr1/android-4.9/android-base.config
@@ -11,7 +11,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o/android-3.18/android-base.config b/o/android-3.18/android-base.config
index d7775c1..417e262 100644
--- a/o/android-3.18/android-base.config
+++ b/o/android-3.18/android-base.config
@@ -9,7 +9,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o/android-4.4/android-base.config b/o/android-4.4/android-base.config
index 40eadb2..c86c5f0 100644
--- a/o/android-4.4/android-base.config
+++ b/o/android-4.4/android-base.config
@@ -9,7 +9,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y
diff --git a/o/android-4.9/android-base.config b/o/android-4.9/android-base.config
index 9efc5c1..e21db06 100644
--- a/o/android-4.9/android-base.config
+++ b/o/android-4.9/android-base.config
@@ -9,7 +9,6 @@
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BLK_DEV_INITRD=y