replicant-vendor_replicant/prebuilt/common
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
..
bin otasigcheck: Avoid long lines in XML 2016-01-04 10:26:54 -08:00
bootanimation Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0 2015-12-17 18:24:03 +01:00
etc 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
lib Missed Capital Letter 2015-11-10 17:28:12 +01:00
media/audio Update boosted audio files 2/2 2015-11-10 17:30:33 +01:00
Android.mk cm: Add a wrapper script for Curl which acts like wget 2015-11-14 23:56:10 +01:00