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
..
common	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
dictionaries/packages/inputmethods/LatinIME/java/res/raw	LatinIME: Refresh dictionaries	2015-10-30 14:31:37 +00:00
opengl/packages/apps/Trebuchet/res/xml
softwaregl	add updated sofwaregl overlay for Trebuchet workspace layout	2015-12-30 22:48:19 +01:00