merge from open-source master

Change-Id: Iee26d951b665e3cec3487dee026f6b529ea2c64d
This commit is contained in:
The Android Open Source Project
2010-05-03 15:25:26 -07:00

View File

@@ -64,32 +64,32 @@
<classpathentry kind="src" path="development/samples/Snake/src"/>
<classpathentry kind="src" path="development/samples/Snake/tests/src"/>
<classpathentry kind="src" path="development/apps/Term/src"/>
<classpathentry kind="src" path="dalvik/libcore/annotation/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/archive/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/auth/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/awt-kernel/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/concurrent/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/crypto/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/dalvik/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/icu/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/json/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/junit/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/logging/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/luni-kernel/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/luni/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/math/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/nio_char/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/nio/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/openssl/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/prefs/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/regex/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/security-kernel/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/security/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/sql/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/suncompat/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/text/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/x-net/src/main/java"/>
<classpathentry kind="src" path="dalvik/libcore/xml/src/main/java"/>
<classpathentry kind="src" path="libcore/annotation/src/main/java"/>
<classpathentry kind="src" path="libcore/archive/src/main/java"/>
<classpathentry kind="src" path="libcore/auth/src/main/java"/>
<classpathentry kind="src" path="libcore/awt-kernel/src/main/java"/>
<classpathentry kind="src" path="libcore/concurrent/src/main/java"/>
<classpathentry kind="src" path="libcore/crypto/src/main/java"/>
<classpathentry kind="src" path="libcore/dalvik/src/main/java"/>
<classpathentry kind="src" path="libcore/icu/src/main/java"/>
<classpathentry kind="src" path="libcore/json/src/main/java"/>
<classpathentry kind="src" path="libcore/junit/src/main/java"/>
<classpathentry kind="src" path="libcore/logging/src/main/java"/>
<classpathentry kind="src" path="libcore/luni-kernel/src/main/java"/>
<classpathentry kind="src" path="libcore/luni/src/main/java"/>
<classpathentry kind="src" path="libcore/math/src/main/java"/>
<classpathentry kind="src" path="libcore/nio_char/src/main/java"/>
<classpathentry kind="src" path="libcore/nio/src/main/java"/>
<classpathentry kind="src" path="libcore/openssl/src/main/java"/>
<classpathentry kind="src" path="libcore/prefs/src/main/java"/>
<classpathentry kind="src" path="libcore/regex/src/main/java"/>
<classpathentry kind="src" path="libcore/security-kernel/src/main/java"/>
<classpathentry kind="src" path="libcore/security/src/main/java"/>
<classpathentry kind="src" path="libcore/sql/src/main/java"/>
<classpathentry kind="src" path="libcore/suncompat/src/main/java"/>
<classpathentry kind="src" path="libcore/text/src/main/java"/>
<classpathentry kind="src" path="libcore/x-net/src/main/java"/>
<classpathentry kind="src" path="libcore/xml/src/main/java"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/ApiDemos_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/Browser_intermediates/src/src"/>
<classpathentry kind="src" path="out/target/common/obj/APPS/Email_intermediates/src/src"/>