resolved conflicts for merge of 97903767 to gingerbread-plus-aosp

Change-Id: Ic71831342d8e7d548b3d082a97486b40e0636994

diff --cc ide/eclipse/.classpath
index 8eddc9e,e7d5e0b..3b17f7c
--- 1/ide/eclipse/.classpath
--- 2/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@@ -47,9 -46,9 +47,10 @@@
        <classpathentry kind="src" path="frameworks/base/services/java"/>
        <classpathentry kind="src" path="frameworks/base/telephony/java"/>
        <classpathentry kind="src" path="frameworks/base/test-runner/src"/>
+       <classpathentry kind="src" path="frameworks/base/voip/java"/>
        <classpathentry kind="src" path="frameworks/base/vpn/java"/>
        <classpathentry kind="src" path="frameworks/base/wifi/java"/>
 +      <classpathentry kind="src" path="frameworks/ex/common/java"/>
        <classpathentry kind="src" path="development/samples/ApiDemos/src"/>
        <classpathentry kind="src" path="development/samples/ApiDemos/tests/src"/>
        <classpathentry kind="src" path="development/samples/Compass/src"/>
@@@ -110,6 -110,10 +112,8 @@@
        <classpathentry kind="src" path="out/target/common/R"/>
        <classpathentry kind="src" path="external/tagsoup/src"/>
        <classpathentry kind="src" path="external/apache-http/src"/>
 -      <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/google-common_intermediates/javalib.jar"/>
 -      <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/gsf-client_intermediates/javalib.jar"/>
+       <classpathentry kind="src" path="external/bouncycastle/src/main/java"/>
+       <classpathentry kind="src" path="external/nist-sip/java"/>
        <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/guava_intermediates/javalib.jar"/>
        <classpathentry kind="lib" path="packages/apps/Calculator/arity-2.1.2.jar"/>
        <classpathentry kind="output" path="out/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/classes"/>