Wolfgang Wiedmeyer
71a01dce17
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
remove prebuilt terminal (built-in terminal app can be activated in dev settings)
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
CHANGELOG.mkdn
CONTRIBUTORS.mkdn
config/cdma.mk
config/cm_audio.mk
config/common.mk
config/common_full.mk
config/common_full_phone.mk
config/gsm.mk
config/themes_common.mk
get-prebuilts
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
overlay/common/frameworks/base/core/res/res/values/config.xml
overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
prebuilt/common/bootanimation/1080.zip
prebuilt/common/bootanimation/1200.zip
prebuilt/common/bootanimation/240.zip
prebuilt/common/bootanimation/320.zip
prebuilt/common/bootanimation/360.zip
prebuilt/common/bootanimation/480.zip
prebuilt/common/bootanimation/540.zip
prebuilt/common/bootanimation/600.zip
prebuilt/common/bootanimation/720.zip
prebuilt/common/bootanimation/768.zip
prebuilt/common/bootanimation/800.zip
prebuilt/common/etc/apns-conf.xml
sepolicy/mac_permissions.xml
sepolicy/sepolicy.mk
vendorsetup.sh
Change-Id: I4fc2a5b00721cae8b3a36f33c36f006142bad44f