summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorFred Quintana <fredq@google.com>2010-08-05 17:57:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-05 17:57:11 -0700
commitc6e7d7658c8b3dd1d8c46090a2cf5a8aaba5b18d (patch)
tree382434c59e592fcf7e7b4ce7a1af413a698d9fee /core
parentf6b5306e90ea0604af0e084210bdd17af5d7b888 (diff)
parentc2a836a5f41897267aa92e5fdeecdf94203d640c (diff)
downloadframeworks_base-c6e7d7658c8b3dd1d8c46090a2cf5a8aaba5b18d.zip
frameworks_base-c6e7d7658c8b3dd1d8c46090a2cf5a8aaba5b18d.tar.gz
frameworks_base-c6e7d7658c8b3dd1d8c46090a2cf5a8aaba5b18d.tar.bz2
am c2a836a5: am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c' * commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c': Changed SyncOperation.toKey() to not rely on the implementation of
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/SyncOperation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/SyncOperation.java b/core/java/android/content/SyncOperation.java
index a7d036f..b016088 100644
--- a/core/java/android/content/SyncOperation.java
+++ b/core/java/android/content/SyncOperation.java
@@ -90,7 +90,7 @@ public class SyncOperation implements Comparable {
private String toKey() {
StringBuilder sb = new StringBuilder();
sb.append("authority: ").append(authority);
- sb.append(" account: ").append(account);
+ sb.append(" account {name=" + account.name + ", type=" + account.type + "}");
sb.append(" extras: ");
extrasToStringBuilder(extras, sb, true /* asKey */);
return sb.toString();