Wolfgang Wiedmeyer 5b2d5516ff Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0 ... Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> Conflicts: overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg		2016-02-03 12:23:07 +01:00
..
permissions	cm: Add live lockscreen feature	2016-02-02 12:23:43 -08:00
cm_audio.mk	Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0	2015-12-17 18:24:03 +01:00
common_full_phone.mk	Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0	2015-12-17 18:24:03 +01:00
common_full_tablet_wifionly.mk	Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0	2015-12-17 18:24:03 +01:00
common_full_tv.mk	config: Create TV targets (full and mini)	2015-06-02 19:34:59 +00:00
common_full.mk	Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0-toolchain	2016-01-14 15:27:42 +01:00
common_mini_phone.mk	Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0	2015-12-17 18:24:03 +01:00
common_mini_tablet_wifionly.mk	Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0	2015-12-17 18:24:03 +01:00
common_mini_tv.mk	config: Create TV targets (full and mini)	2015-06-02 19:34:59 +00:00
common.mk	Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0	2016-02-03 12:23:07 +01:00
nfc_enhanced.mk	Initial Replicant 4.2 commit	2013-12-28 17:01:11 +01:00
telephony.mk	Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0	2015-12-17 18:24:03 +01:00
themes_common.mk	Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0	2015-12-17 18:24:03 +01:00