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
..
default_wallpaper.jpg	Add new default wallpaper for CM13	2016-01-19 17:37:32 -08:00
usb_android.png	Initial Replicant 4.2 commit	2013-12-28 17:01:11 +01:00
usb_android_connected.png	Initial Replicant 4.2 commit	2013-12-28 17:01:11 +01:00