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