am 7a260ba9: Merge change 23824 into eclair

Merge commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3' into eclair-plus-aosp

* commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3':
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.

test-runner/android/test/IsolatedContext.java

@@ -4,6 +4,7 @@ import com.google.android.collect.Lists;
 
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdatedListener;
+import android.accounts.Account;
 import android.content.ContextWrapper;
 import android.content.ContentResolver;
 import android.content.Intent;
@@ -101,6 +102,10 @@ public class IsolatedContext extends ContextWrapper {
                 Handler handler, boolean updateImmediately) {
             // do nothing
         }
+
+        public Account[] getAccounts() {
+            return new Account[]{};
+        }
     }
     @Override
     public File getFilesDir() {