Merge branch 'cm-11.0' into stable/cm-11.0

This commit is contained in:
Brint E. Kriebel 2014-09-02 19:56:16 -07:00
commit 414b1135ec

View File

@ -54,6 +54,8 @@
<project path="external/android-mock" name="CyanogenMod/android_external_android-mock" /> <project path="external/android-mock" name="CyanogenMod/android_external_android-mock" />
<project path="external/android-visualizer" name="CyanogenMod/android_external_android-visualizer" /> <project path="external/android-visualizer" name="CyanogenMod/android_external_android-visualizer" />
<project path="external/ant-glob" name="CyanogenMod/android_external_ant-glob" /> <project path="external/ant-glob" name="CyanogenMod/android_external_ant-glob" />
<project path="external/ant-wireless/ant_native" name="CyanogenMod/android_external_ant-wireless_ant_native" />
<project path="external/ant-wireless/ant_service" name="CyanogenMod/android_external_ant-wireless_ant_service" />
<project path="external/antlr" name="CyanogenMod/android_external_antlr" /> <project path="external/antlr" name="CyanogenMod/android_external_antlr" />
<project path="external/apache-harmony" name="CyanogenMod/android_external_apache-harmony" /> <project path="external/apache-harmony" name="CyanogenMod/android_external_apache-harmony" />
<project path="external/apache-http" name="CyanogenMod/android_external_apache-http" /> <project path="external/apache-http" name="CyanogenMod/android_external_apache-http" />
@ -363,6 +365,7 @@
<project path="packages/apps/CellBroadcastReceiver" name="CyanogenMod/android_packages_apps_CellBroadcastReceiver" /> <project path="packages/apps/CellBroadcastReceiver" name="CyanogenMod/android_packages_apps_CellBroadcastReceiver" />
<project path="packages/apps/CertInstaller" name="CyanogenMod/android_packages_apps_CertInstaller" /> <project path="packages/apps/CertInstaller" name="CyanogenMod/android_packages_apps_CertInstaller" />
<project path="packages/apps/CMAccount" name="CyanogenMod/android_packages_apps_CMAccount" /> <project path="packages/apps/CMAccount" name="CyanogenMod/android_packages_apps_CMAccount" />
<project path="packages/apps/CMBugReport" name="CyanogenMod/android_packages_apps_CMBugreport" />
<project path="packages/apps/CMFileManager" name="CyanogenMod/android_packages_apps_CMFileManager" /> <project path="packages/apps/CMFileManager" name="CyanogenMod/android_packages_apps_CMFileManager" />
<project path="packages/apps/CMHome" name="CyanogenMod/android_packages_apps_CMHome" /> <project path="packages/apps/CMHome" name="CyanogenMod/android_packages_apps_CMHome" />
<project path="packages/apps/CMUpdater" name="CyanogenMod/android_packages_apps_CMUpdater" /> <project path="packages/apps/CMUpdater" name="CyanogenMod/android_packages_apps_CMUpdater" />