diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-11-08 16:09:19 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-11-08 16:09:19 -0800 |
| commit | 731555636a82034fc4f89ec3fd0ed46c13508887 (patch) | |
| tree | a5016c3df3ee03d40df4b9dffdf2d512ca6797c4 /ide | |
| parent | a0890774431a807015e2907767ff5cde382b2dd1 (diff) | |
| parent | 041c6fc2c6e805c8bd055c2003b687870de57c32 (diff) | |
| download | android_development-731555636a82034fc4f89ec3fd0ed46c13508887.tar.gz android_development-731555636a82034fc4f89ec3fd0ed46c13508887.tar.bz2 android_development-731555636a82034fc4f89ec3fd0ed46c13508887.zip | |
merge from open-source master
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/eclipse/.classpath | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath index 71694d43f..16f5b44d6 100644 --- a/ide/eclipse/.classpath +++ b/ide/eclipse/.classpath @@ -23,7 +23,6 @@ <classpathentry kind="src" path="packages/providers/ContactsProvider/src"/> <classpathentry kind="src" path="packages/providers/DownloadProvider/src"/> <classpathentry kind="src" path="packages/providers/DrmProvider/src"/> - <classpathentry kind="src" path="packages/providers/ImProvider/src"/> <classpathentry kind="src" path="packages/providers/MediaProvider/src"/> <classpathentry kind="src" path="packages/providers/TelephonyProvider/src"/> <classpathentry kind="src" path="frameworks/base/awt"/> @@ -48,6 +47,7 @@ <classpathentry kind="src" path="frameworks/base/tts/java"/> <classpathentry kind="src" path="frameworks/base/vpn/java"/> <classpathentry kind="src" path="frameworks/base/wifi/java"/> + <classpathentry kind="src" path="frameworks/base/vpn/java"/> <classpathentry kind="src" path="frameworks/policies/base/phone"/> <classpathentry kind="src" path="development/samples/ApiDemos/src"/> <classpathentry kind="src" path="development/samples/ApiDemos/tests/src"/> @@ -102,6 +102,7 @@ <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/vpn/java"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java"/> + <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/vpn/java"/> <classpathentry kind="src" path="out/target/common/R"/> <classpathentry kind="src" path="external/tagsoup/src"/> <classpathentry kind="src" path="external/protobuf/src"/> |