diff options
author | Yifan Hong <elsk@google.com> | 2020-09-23 04:05:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-23 04:05:28 +0000 |
commit | e4102999005f8f3c8db1fdacfba80a2c581a72f1 (patch) | |
tree | 6261efb054dfb209a3c88ce9829112d38da6bfa0 | |
parent | 71874b9b380be2739210ad3b1ad9cdf4a6a469d7 (diff) | |
parent | 6ed731396bee16b6d8be8846409a9dd2518eed12 (diff) | |
download | configs-e4102999005f8f3c8db1fdacfba80a2c581a72f1.tar.gz |
resolve merge conflicts of 0c0ce4d223c78d2d333f2fc71af52fbe6cba507e to qt-dev am: 1d2f6e2ec5 am: a75f17bb43 am: f735ca427b am: 6ed731396bandroid-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-release
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/12663729
Change-Id: I70f224446c923741b8c4dfce4aec5566d31fe6e5
-rw-r--r-- | o-mr1/android-3.18/android-base.config | 1 | ||||
-rw-r--r-- | o-mr1/android-4.4/android-base.config | 1 | ||||
-rw-r--r-- | o-mr1/android-4.9/android-base.config | 1 | ||||
-rw-r--r-- | o/android-3.18/android-base.config | 1 | ||||
-rw-r--r-- | o/android-4.4/android-base.config | 1 | ||||
-rw-r--r-- | o/android-4.9/android-base.config | 1 |
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 |