diff options
author | The Android Open Source Project | 2013-01-28 12:58:01 -0600 |
---|---|---|
committer | The Android Open Source Project | 2013-01-28 12:58:10 -0600 |
commit | eba1eee60f074a417e8c290794a19e3c5e3b9724 (patch) | |
tree | a1ea69af0ccce20fd63fc575d310584a913ffe4d | |
parent | df404566509f125268b0d726022db8b41f157859 (diff) | |
parent | bc65e60b0366a9c1de396ef58e996a3540d3d198 (diff) | |
download | platform-manifest-eba1eee60f074a417e8c290794a19e3c5e3b9724.tar.gz platform-manifest-eba1eee60f074a417e8c290794a19e3c5e3b9724.tar.xz platform-manifest-eba1eee60f074a417e8c290794a19e3c5e3b9724.zip |
Merge from master
Change-Id: If2ca4db261e8ebd9bd684f09bdbba3df4ebc05a0
-rw-r--r-- | default.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/default.xml b/default.xml index 34f8293..9574ec8 100644 --- a/default.xml +++ b/default.xml | |||
@@ -144,6 +144,7 @@ | |||
144 | <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" /> | 144 | <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" /> |
145 | <project path="external/mesa3d" name="platform/external/mesa3d" groups="pdk" /> | 145 | <project path="external/mesa3d" name="platform/external/mesa3d" groups="pdk" /> |
146 | <project path="external/mksh" name="platform/external/mksh" groups="pdk" /> | 146 | <project path="external/mksh" name="platform/external/mksh" groups="pdk" /> |
147 | <project path="external/mockito" name="platform/external/mockito" /> | ||
147 | <project path="external/mockwebserver" name="platform/external/mockwebserver" /> | 148 | <project path="external/mockwebserver" name="platform/external/mockwebserver" /> |
148 | <project path="external/mp4parser" name="platform/external/mp4parser" /> | 149 | <project path="external/mp4parser" name="platform/external/mp4parser" /> |
149 | <project path="external/mtpd" name="platform/external/mtpd" /> | 150 | <project path="external/mtpd" name="platform/external/mtpd" /> |
@@ -154,6 +155,7 @@ | |||
154 | <project path="external/nist-pkits" name="platform/external/nist-pkits" /> | 155 | <project path="external/nist-pkits" name="platform/external/nist-pkits" /> |
155 | <project path="external/nist-sip" name="platform/external/nist-sip" /> | 156 | <project path="external/nist-sip" name="platform/external/nist-sip" /> |
156 | <project path="external/oauth" name="platform/external/oauth" /> | 157 | <project path="external/oauth" name="platform/external/oauth" /> |
158 | <project path="external/objenesis" name="platform/external/objenesis" /> | ||
157 | <project path="external/okhttp" name="platform/external/okhttp" /> | 159 | <project path="external/okhttp" name="platform/external/okhttp" /> |
158 | <project path="external/opencv" name="platform/external/opencv" /> | 160 | <project path="external/opencv" name="platform/external/opencv" /> |
159 | <project path="external/openfst" name="platform/external/openfst" /> | 161 | <project path="external/openfst" name="platform/external/openfst" /> |