commit e85c304f7d09946505e56881ca05a64ac88629f7
author Andrew Stadler <stadler@android.com> Wed Dec 09 12:07:31 2009 -0800
committer Andrew Stadler <stadler@android.com> Wed Dec 09 12:07:31 2009 -0800
tree 89456b5474756b982cacf54bc0b2944426ae8b2d
parent 0a510b1f704ac940cf3d166a4f139c1910db1677
parent fa3d6b5411c99b9d7cb9ac6139e372b898cea90f

resolved conflicts for merge of fa3d6b54 to eclair-mr2-plus-aosp

ide/eclipse/.classpath

diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index 2efc6c4..743367d 100644
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -48,7 +48,6 @@
 	<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"/>
@@ -103,7 +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/obj/JAVA_LIBRARIES/services_intermediates/src"/>
 	<classpathentry kind="src" path="out/target/common/R"/>
 	<classpathentry kind="src" path="external/tagsoup/src"/>
 	<classpathentry kind="src" path="external/protobuf/src"/>