Merge from master

Change-Id: If0f6099470a5098ed32efcfecbedd5cd60523db6
This commit is contained in:
The Android Open Source Project 2013-01-17 09:03:24 -08:00
commit df40456650

View file

@ -151,6 +151,7 @@
<project path="external/netcat" name="platform/external/netcat" />
<project path="external/netperf" name="platform/external/netperf" />
<project path="external/neven" name="platform/external/neven" />
<project path="external/nist-pkits" name="platform/external/nist-pkits" />
<project path="external/nist-sip" name="platform/external/nist-sip" />
<project path="external/oauth" name="platform/external/oauth" />
<project path="external/okhttp" name="platform/external/okhttp" />