summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-09-02 19:56:16 -0700
committerBrint E. Kriebel <bekit@cyngn.com>2014-09-02 19:56:16 -0700
commit414b1135ece819698c750b48413d5234d2be1caf (patch)
treeb88920e5acf8c0d6c790766a2f96f20e26ffb205
parenta87ab3fb079867a7eabb442708ee6a842b246837 (diff)
parentae3706abf2297f3436773778aa999a62075269b5 (diff)
downloadandroid-414b1135ece819698c750b48413d5234d2be1caf.tar.gz
android-414b1135ece819698c750b48413d5234d2be1caf.tar.bz2
android-414b1135ece819698c750b48413d5234d2be1caf.zip
Merge branch 'cm-11.0' into stable/cm-11.0
-rw-r--r--default.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index 8fad82b4..71b0a6c6 100644
--- a/default.xml
+++ b/default.xml
@@ -54,6 +54,8 @@
<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/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/apache-harmony" name="CyanogenMod/android_external_apache-harmony" />
<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/CertInstaller" name="CyanogenMod/android_packages_apps_CertInstaller" />
<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/CMHome" name="CyanogenMod/android_packages_apps_CMHome" />
<project path="packages/apps/CMUpdater" name="CyanogenMod/android_packages_apps_CMUpdater" />