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
..
apicheck.mk	cm: Publish system api as part of publish process.	2015-12-23 12:38:15 -08:00
clear_vars.mk	cm: Fixup maven artifact publish inclusions.	2016-01-05 20:12:23 -08:00
config.mk
definitions.mk
maven_artifact_publish.mk	cm: Fixup maven artifact publish inclusions.	2016-01-05 20:12:23 -08:00
maven_artifact.mk	Fixed mmm For Maven APK	2016-01-18 10:32:36 -08:00