summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project2013-05-15 14:13:02 -0500
committerThe Android Open Source Project2013-05-15 14:13:02 -0500
commitbf7ac6708aef074826326e2d59788d3340b4815d (patch)
tree2e9c20bcbf402504c8dd491730b0f837ac77080f
parenta7f38b7d52bcd31e310d2b9cc6c060c71d4e0442 (diff)
parentced9b3334e92b0924c57482d5f5fe2c3caf7a90f (diff)
downloadplatform-manifest-bf7ac6708aef074826326e2d59788d3340b4815d.tar.gz
platform-manifest-bf7ac6708aef074826326e2d59788d3340b4815d.tar.xz
platform-manifest-bf7ac6708aef074826326e2d59788d3340b4815d.zip
Merge from master
-rw-r--r--default.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index 2082b3a..838aa74 100644
--- a/default.xml
+++ b/default.xml
@@ -360,11 +360,13 @@
360 <project path="system/security" name="platform/system/security" groups="pdk" /> 360 <project path="system/security" name="platform/system/security" groups="pdk" />
361 <project path="system/vold" name="platform/system/vold" groups="pdk" /> 361 <project path="system/vold" name="platform/system/vold" groups="pdk" />
362 <project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" groups="notdefault,tools" /> 362 <project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" groups="notdefault,tools" />
363 <project path="tools/adt/idea" name="platform/tools/adt/idea" groups="notdefault,tools" />
363 <project path="tools/base" name="platform/tools/base" groups="notdefault,tools" /> 364 <project path="tools/base" name="platform/tools/base" groups="notdefault,tools" />
364 <project path="tools/build" name="platform/tools/build" groups="notdefault,tools" /> 365 <project path="tools/build" name="platform/tools/build" groups="notdefault,tools" />
365 <project path="tools/emulator" name="platform/tools/emulator" groups="notdefault,tools" /> 366 <project path="tools/emulator" name="platform/tools/emulator" groups="notdefault,tools" />
366 <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" groups="tools" /> 367 <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" groups="tools" />
367 <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="notdefault,tools" /> 368 <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="notdefault,tools" />
369 <project path="tools/idea" name="platform/tools/idea" groups="notdefault,tools" />
368 <project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,motodev" /> 370 <project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,motodev" />
369 <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" /> 371 <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" />
370 372