replicant-vendor_replicant/prebuilt
Wolfgang Wiedmeyer f55a720155 Merge remote-tracking branch 'cyanogenmod/cm-13.0' into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

Conflicts:
	config/common.mk
2015-12-17 21:10:59 +01:00
..
common Merge remote-tracking branch 'cyanogenmod/cm-13.0' into replicant-6.0 2015-12-17 21:10:59 +01:00
softwaregl/configs