merge from eclair

diff --cc ide/eclipse/.classpath
index 61d39d6,71694d4..16f5b44
--- 1/ide/eclipse/.classpath
--- 2/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@@ -47,8 -46,8 +45,9 @@@
        <classpathentry kind="src" path="frameworks/base/telephony/java"/>
        <classpathentry kind="src" path="frameworks/base/test-runner"/>
        <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,10 -100,8 +100,9 @@@
        <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/tts/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"/>

diff --cc samples/ApiDemos/res/values/strings.xml
Simple merge

diff --cc tools/traceview/etc/traceview
Simple merge