resolved conflicts for merge of e85c304f to master

diff --cc ide/eclipse/.classpath
index 9bea749,743367d..7f5c6f4
--- 1/ide/eclipse/.classpath
--- 2/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@@ -17,7 -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,7 -95,7 +94,6 @@@
        <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"/>