summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project2013-01-17 11:03:24 -0600
committerThe Android Open Source Project2013-01-17 11:03:31 -0600
commitdf404566509f125268b0d726022db8b41f157859 (patch)
treead4ec94bc581f8271825405744a0aa2440a8108f
parent8c9a56d57b416afd7a5aafce32ac741b904e4028 (diff)
parente046a83bf17b787e4cfd10181f6c007eeefe277c (diff)
downloadplatform-manifest-df404566509f125268b0d726022db8b41f157859.tar.gz
platform-manifest-df404566509f125268b0d726022db8b41f157859.tar.xz
platform-manifest-df404566509f125268b0d726022db8b41f157859.zip
Merge from master
Change-Id: If0f6099470a5098ed32efcfecbedd5cd60523db6
-rw-r--r--default.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index 32b73cc..34f8293 100644
--- a/default.xml
+++ b/default.xml
@@ -151,6 +151,7 @@
151 <project path="external/netcat" name="platform/external/netcat" /> 151 <project path="external/netcat" name="platform/external/netcat" />
152 <project path="external/netperf" name="platform/external/netperf" /> 152 <project path="external/netperf" name="platform/external/netperf" />
153 <project path="external/neven" name="platform/external/neven" /> 153 <project path="external/neven" name="platform/external/neven" />
154 <project path="external/nist-pkits" name="platform/external/nist-pkits" />
154 <project path="external/nist-sip" name="platform/external/nist-sip" /> 155 <project path="external/nist-sip" name="platform/external/nist-sip" />
155 <project path="external/oauth" name="platform/external/oauth" /> 156 <project path="external/oauth" name="platform/external/oauth" />
156 <project path="external/okhttp" name="platform/external/okhttp" /> 157 <project path="external/okhttp" name="platform/external/okhttp" />