resolved conflicts for merge of e85c304f to master

[android-x86/development.git] / ide / eclipse / .classpath

diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index 9bea749..7f5c6f4 100644 (file)
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -17,7 +17,6 @@
        <classpathentry kind="src" path="packages/apps/Settings/src"/>
        <classpathentry kind="src" path="packages/apps/SoundRecorder/src"/>
        <classpathentry kind="src" path="packages/apps/Stk/src"/>
-       <classpathentry kind="src" path="packages/apps/Updater/src"/>
        <classpathentry kind="src" path="packages/apps/VoiceDialer/src"/>
        <classpathentry kind="src" path="packages/providers/CalendarProvider/src"/>
        <classpathentry kind="src" path="packages/providers/ContactsProvider/src"/>
@@ -95,13 +94,13 @@
        <classpathentry kind="src" path="out/target/common/obj/APPS/Email_intermediates/src/src"/>
        <classpathentry kind="src" path="out/target/common/obj/APPS/Music_intermediates/src/src"/>
        <classpathentry kind="src" path="out/target/common/obj/APPS/Phone_intermediates/src/src"/>
-       <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/com.android.im.plugin_intermediates/src"/>
        <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java"/>
        <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/location/java"/>
        <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/media/java"/>
        <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/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"/>