Merge branch 'replicant-6.0-dev' into replicant-6.0

This commit is contained in:
Wolfgang Wiedmeyer 2017-01-27 23:27:37 +01:00
commit 5c1f515bea

View File

@ -181,7 +181,7 @@
<project path="frameworks/wilhelm" name="CyanogenMod/android_frameworks_wilhelm" groups="pdk-cw-fs,pdk-fs" /> <project path="frameworks/wilhelm" name="CyanogenMod/android_frameworks_wilhelm" groups="pdk-cw-fs,pdk-fs" />
<project path="hardware/akm" name="CyanogenMod/android_hardware_akm" /> <project path="hardware/akm" name="CyanogenMod/android_hardware_akm" />
<project path="hardware/broadcom/libbt" name="CyanogenMod/android_hardware_broadcom_libbt" groups="pdk" /> <project path="hardware/broadcom/libbt" name="CyanogenMod/android_hardware_broadcom_libbt" groups="pdk" />
<project path="hardware/broadcom/wlan" name="CyanogenMod/android_hardware_broadcom_wlan" groups="pdk,broadcom_wlan" /> <project path="hardware/broadcom/wlan" name="hardware_broadcom_wlan.git" remote="fossencdi" groups="pdk,broadcom_wlan" />
<project path="hardware/cyanogen" name="CyanogenMod/android_hardware_cyanogen" /> <project path="hardware/cyanogen" name="CyanogenMod/android_hardware_cyanogen" />
<project path="hardware/intel/common/libmix" name="CyanogenMod/android_hardware_intel_common_libmix" groups="intel" /> <project path="hardware/intel/common/libmix" name="CyanogenMod/android_hardware_intel_common_libmix" groups="intel" />
<project path="hardware/intel/common/libva" name="CyanogenMod/android_hardware_intel_common_libva" groups="intel" /> <project path="hardware/intel/common/libva" name="CyanogenMod/android_hardware_intel_common_libva" groups="intel" />
@ -525,12 +525,17 @@
<project path="kernel/samsung/smdk4412" name="kernel_samsung_smdk4412.git" remote="fossencdi" /> <project path="kernel/samsung/smdk4412" name="kernel_samsung_smdk4412.git" remote="fossencdi" />
<!-- DEVICE SPECIFIC --> <!-- DEVICE SPECIFIC -->
<project path="device/samsung/i9100" name="device_samsung_i9100.git" remote="fossencdi" />
<project path="device/samsung/i9300" name="device_samsung_i9300.git" remote="fossencdi" /> <project path="device/samsung/i9300" name="device_samsung_i9300.git" remote="fossencdi" />
<project path="device/samsung/i9305" name="device_samsung_i9305.git" remote="fossencdi" />
<project path="device/samsung/galaxys2-common" name="device_samsung_galaxys2-common.git" remote="fossencdi" />
<project path="device/samsung/smdk4412-common" name="device_samsung_smdk4412-common.git" remote="fossencdi" /> <project path="device/samsung/smdk4412-common" name="device_samsung_smdk4412-common.git" remote="fossencdi" />
<project path="device/samsung/smdk4412-qcom-common" name="CyanogenMod/android_device_samsung_smdk4412-qcom-common" />
<project path="hardware/ril/samsung-ril" name="hardware_ril_samsung-ril.git" remote="fossencdi" /> <project path="hardware/ril/samsung-ril" name="hardware_ril_samsung-ril.git" remote="fossencdi" />
<project path="external/libsamsung-ipc" name="external_libsamsung-ipc.git" remote="fossencdi" /> <project path="external/libsamsung-ipc" name="external_libsamsung-ipc.git" remote="fossencdi" />
<project path="packages/apps/SamsungServiceMode" name="CyanogenMod/android_packages_apps_SamsungServiceMode" /> <project path="packages/apps/SamsungServiceMode" name="CyanogenMod/android_packages_apps_SamsungServiceMode" />
<project path="hardware/samsung" name="CyanogenMod/android_hardware_samsung" /> <project path="hardware/samsung" name="CyanogenMod/android_hardware_samsung" />
<project path="hardware/tinyalsa-audio" name="hardware_tinyalsa-audio" remote="fossencdi" />
<project path="external/stlport" name="CyanogenMod/android_external_stlport" /> <project path="external/stlport" name="CyanogenMod/android_external_stlport" />
</manifest> </manifest>