summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-01-28 10:58:31 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2013-01-28 10:58:33 -0800
commit3ef51d6de5ef0c82b4ef4f49262535aab26ff1d3 (patch)
treea78fe77b28cbded64e9b65ec85126330fa9e1347
parent9237c069427081ddc519e2bf21ecfaa476883dd1 (diff)
parentbc65e60b0366a9c1de396ef58e996a3540d3d198 (diff)
downloadmanifest-3ef51d6de5ef0c82b4ef4f49262535aab26ff1d3.tar.gz
Merge from master
Change-Id: I2e206570621ddd5e35cfa9fecc45770f2666c0fd
-rw-r--r--default.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index c1c205220..2f02cfb95 100644
--- a/default.xml
+++ b/default.xml
@@ -144,6 +144,7 @@
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" />
<project path="external/mesa3d" name="platform/external/mesa3d" groups="pdk" />
<project path="external/mksh" name="platform/external/mksh" groups="pdk" />
+ <project path="external/mockito" name="platform/external/mockito" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
<project path="external/mp4parser" name="platform/external/mp4parser" />
<project path="external/mtpd" name="platform/external/mtpd" />
@@ -154,6 +155,7 @@
<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/objenesis" name="platform/external/objenesis" />
<project path="external/okhttp" name="platform/external/okhttp" />
<project path="external/opencv" name="platform/external/opencv" />
<project path="external/openfst" name="platform/external/openfst" />