Merge from master

Change-Id: I6345a9ea12d631334ae797bfd137552984f965c4
This commit is contained in:
The Android Open Source Project 2012-12-14 11:29:34 -08:00
commit ded671af82

View file

@ -357,7 +357,9 @@
<project path="system/security" name="platform/system/security" /> <project path="system/security" name="platform/system/security" />
<project path="system/vold" name="platform/system/vold" /> <project path="system/vold" name="platform/system/vold" />
<project path="tools/base" name="platform/tools/base" groups="notdefault,tools" /> <project path="tools/base" name="platform/tools/base" groups="notdefault,tools" />
<project path="tools/build" name="platform/tools/build" groups="notdefault,tools,toolsbuild" /> <project path="tools/build" name="platform/tools/build" groups="notdefault,tools" />
<project path="tools/motodev" name="platform/tools/motodev" /> <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="notdefault,tools" />
<project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,motodev" />
<project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" />
</manifest> </manifest>