diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-26 10:20:38 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-26 10:20:38 +0100 |
| commit | 58e6fbe4ee35d65e14b626c557d37565bf8ad179 (patch) | |
| tree | 8cf095f4f552a47efa4566d1983574e75bc85595 /sync | |
| parent | 0e2fcb857cf4c6230fc3aa213f6a0b0b4f644fd0 (diff) | |
| download | chromium_org-58e6fbe4ee35d65e14b626c557d37565bf8ad179.tar.gz | |
Merge from Chromium at DEPS revision r213780
This commit was generated by merge_to_master.py.
Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java b/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java index 96b94bb102..a6fea9d452 100644 --- a/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java +++ b/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java @@ -38,8 +38,8 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @Override public AccountManagerFuture<Bundle> getAuthToken(Account account, String authTokenType, boolean notifyAuthFailure, AccountManagerCallback<Bundle> callback, Handler handler) { - return mAccountManager.getAuthToken(account, authTokenType, notifyAuthFailure, callback, - handler); + return mAccountManager.getAuthToken(account, authTokenType, null, notifyAuthFailure, + callback, handler); } @Override |