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
..
frameworks/base	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
packages	Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0	2015-12-17 18:24:03 +01:00
vendor/cmsdk	perf: Moving PerformanceManager to CMSDK	2015-11-03 18:55:49 -08:00