Merge branch 'cm-12.1' of https://github.com/vince2678/android_device_samsung_gprimeltecan into cm-12.1
diff --git a/local_manifest/local_manifest.xml b/local_manifest/local_manifest.xml
index 8c08d87..70d2222 100644
--- a/local_manifest/local_manifest.xml
+++ b/local_manifest/local_manifest.xml
@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
+
+ <remove-project name="CyanogenMod/android_frameworks_base" />
+ <remove-project name="CyanogenMod/android_frameworks_opt_telephony" />
+
+ <project path="frameworks/base" name="CyanogenMod/android_frameworks_base" revision="caf/cm-12.1" />
+ <project path="frameworks/opt/telephony" name="CyanogenMod/android_frameworks_opt_telephony" groups="pdk" revision="caf/cm-12.1" />
<project path="device/samsung/gprimeltecan" name="vince2678/android_device_samsung_gprimeltecan" groups="device" remote="github" revision="cm-12.1"/>
<project path="device/qcom-common" name="vince2678/android_device_qcom-common" remote="github" revision="cm-12.1"/>
<project path="vendor/samsung/gprimeltecan" name="vince2678/android_vendor_samsung_gprimeltecan" remote="github" revision="cm-12.1"/>
<project path="device/samsung/qcom-common" name="CyanogenMod/android_device_samsung_qcom-common" groups="device" />
- <project path="hardware/samsung" name="CyanogenMod/android_hardware_samsung" />
</manifest>