Merge from master

Change-Id: I27f20b0f86cc964b6efe0a99e37798bb53737049
This commit is contained in:
The Android Open Source Project 2013-01-04 14:14:39 -08:00
commit 207fe05ecb

View file

@ -319,6 +319,7 @@
<project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="pdk,darwin" />
<project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="pdk,linux" />
<project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="pdk,linux" />
<project path="prebuilts/devtools" name="platform/prebuilts/devtools" />
<project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" groups="pdk" />
<project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" />
<project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" />