summaryrefslogtreecommitdiffstats
path: root/core/java/android/accounts/AccountManager.java
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-03-29 14:48:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-29 14:48:35 -0700
commit6eebd6e6b44d7688489c430cad933e971530e43d (patch)
tree9d00490378da7e9287be0d6cec471da1aca05600 /core/java/android/accounts/AccountManager.java
parentac1807ab1d90a531550ee07356c52fe05abae32d (diff)
parent6f50c846ad46dfeadf8eac389102031662ad892f (diff)
downloadframeworks_base-6eebd6e6b44d7688489c430cad933e971530e43d.zip
frameworks_base-6eebd6e6b44d7688489c430cad933e971530e43d.tar.gz
frameworks_base-6eebd6e6b44d7688489c430cad933e971530e43d.tar.bz2
am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
* commit '6f50c846ad46dfeadf8eac389102031662ad892f': Doc update: incorrect method name
Diffstat (limited to 'core/java/android/accounts/AccountManager.java')
-rw-r--r--core/java/android/accounts/AccountManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java
index bcb35d5..f490e79 100644
--- a/core/java/android/accounts/AccountManager.java
+++ b/core/java/android/accounts/AccountManager.java
@@ -1853,7 +1853,7 @@ public class AccountManager {
* <p>
* The most common case is to call this with one account type, e.g.:
* <p>
- * <pre> newChooseAccountsIntent(null, null, new String[]{"com.google"}, false, null,
+ * <pre> newChooseAccountIntent(null, null, new String[]{"com.google"}, false, null,
* null, null, null);</pre>
* @param selectedAccount if specified, indicates that the {@link Account} is the currently
* selected one, according to the caller's definition of selected.