diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
| commit | 60e5a34630c69e575f157a2babac70048cc3bdb1 (patch) | |
| tree | 9691d92caa5fba82bf307cf2af3374c616053bb8 /Android.mk | |
| parent | 8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff) | |
| parent | 02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff) | |
| download | device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2 device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip | |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts:
BoardCommonConfig.mk
camera/Android.mk
common.mk
configs/80cfw
lpm.rc
overlay/frameworks/base/core/res/res/values/config.xml
overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter i9300 i9305 n7100 n8000 n8013 t0lte t0lteatt t0ltetmo i605 l900 r950 i925 n5100 n5110 n5120,$(TARGET_DEVICE)),) +ifneq ($(filter i9300 i9305 n7100 n8000 n8013 n8020 t0lte t0lteatt t0ltetmo i605 l900 r950 i925 n5100 n5110 n5120 lt013g lt01wifi lt01lte,$(TARGET_DEVICE)),) include $(call all-makefiles-under,$(LOCAL_PATH)) |