diff options
| author | Yifan Hong <elsk@google.com> | 2020-09-22 16:20:11 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2020-09-22 16:20:11 -0700 |
| commit | 1d2f6e2ec5999efd8ee2593bee0d22e8e1347e4c (patch) | |
| tree | 604575047d2558a7c447c73e93ab9d9b640f70ac /o-mr1/android-3.18/android-base.config | |
| parent | 1c616c6f0a9798a0dfabdf4ebc5c853ace40bafb (diff) | |
| parent | 0c0ce4d223c78d2d333f2fc71af52fbe6cba507e (diff) | |
| download | configs-1d2f6e2ec5999efd8ee2593bee0d22e8e1347e4c.tar.gz | |
resolve merge conflicts of 0c0ce4d223c78d2d333f2fc71af52fbe6cba507e to qt-dev
Bug: 113836751
Change-Id: Icea6ded5d7fbfd8c4044cbde8a2b8b7c4020686a
Diffstat (limited to 'o-mr1/android-3.18/android-base.config')
| -rw-r--r-- | o-mr1/android-3.18/android-base.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/o-mr1/android-3.18/android-base.config b/o-mr1/android-3.18/android-base.config index 1ed2ab5..ca9dcce 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 |