Merge "Fixing the PDK build. A file PDK slurps in was moved."
diff --git a/apps/Development/src/com/android/development/AccountsTester.java b/apps/Development/src/com/android/development/AccountsTester.java
index ba0622d..f8ff736 100644
--- a/apps/Development/src/com/android/development/AccountsTester.java
+++ b/apps/Development/src/com/android/development/AccountsTester.java
@@ -221,6 +221,14 @@
mLongPressedAccount = holder.account;
}
+ protected void onSaveInstanceState(Bundle outState) {
+ outState.putParcelable("account", mLongPressedAccount);
+ }
+
+ protected void onRestoreInstanceState(Bundle savedInstanceState) {
+ mLongPressedAccount = savedInstanceState.getParcelable("account");
+ }
+
@Override
public boolean onContextItemSelected(MenuItem item) {
if (item.getItemId() == R.id.accounts_tester_remove_account) {
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index eb2fa76..55450da 100644
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -106,6 +106,7 @@
<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="lib" path="out/target/common/obj/JAVA_LIBRARIES/guava_intermediates/javalib.jar"/>
<classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/mms-common_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"/>