Merge remote-tracking branch 'github/cm-11.0' into HEAD

This commit is contained in:
Brint E. Kriebel 2014-01-31 17:02:37 -08:00
commit cbc9a0b194

View File

@ -266,6 +266,7 @@
<project path="external/whispersystems/TextSecure" name="CyanogenMod/android_external_whispersystems_TextSecure" />
<project path="external/whispersystems/WhisperPush" name="CyanogenMod/android_external_whispersystems_WhisperPush" />
<project path="external/wpa_supplicant_8" name="CyanogenMod/android_external_wpa_supplicant_8" groups="pdk" />
<project path="external/wpa_supplicant_8_ti" name="CyanogenMod/android_external_wpa_supplicant_8_ti" />
<project path="external/xmlwriter" name="CyanogenMod/android_external_xmlwriter" />
<project path="external/xmp_toolkit" name="CyanogenMod/android_external_xmp_toolkit" />
<project path="external/yaffs2" name="CyanogenMod/android_external_yaffs2" groups="pdk" />
@ -374,6 +375,7 @@
<project path="packages/apps/Tag" name="CyanogenMod/android_packages_apps_Tag" />
<project path="packages/apps/UnifiedEmail" name="CyanogenMod/android_packages_apps_UnifiedEmail" />
<project path="packages/apps/Torch" name="CyanogenMod/android_packages_apps_Torch" />
<project path="packages/apps/Trebuchet" name="CyanogenMod/android_packages_apps_Trebuchet" />
<project path="packages/apps/VideoEditor" name="CyanogenMod/android_packages_apps_VideoEditor" />
<project path="packages/apps/VoiceDialer" name="CyanogenMod/android_packages_apps_VoiceDialer" />
<project path="packages/apps/VoicePlus" name="CyanogenMod/android_packages_apps_VoicePlus" />