diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-30 20:34:34 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-09-30 20:34:34 -0700 |
| commit | dc71b9e4d67327065a992924a021cad4bc100fa2 (patch) | |
| tree | 1a27c83ca574c7f0a14bc69b0e2d34edaa13aeb8 /core/java/android/app/ActivityThread.java | |
| parent | 557ed7aa290497fb5764acb3f577edbe78bad5b9 (diff) | |
| parent | 6a3eddb469b282f7d904e5dbcb375ad44ada3ee3 (diff) | |
| download | frameworks_base-dc71b9e4d67327065a992924a021cad4bc100fa2.zip frameworks_base-dc71b9e4d67327065a992924a021cad4bc100fa2.tar.gz frameworks_base-dc71b9e4d67327065a992924a021cad4bc100fa2.tar.bz2 | |
resolved conflicts for merge of 6a3eddb4 to master
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index b8bbc88..df18ce7 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -3352,7 +3352,7 @@ public final class ActivityThread { while (i.hasNext()) { ProviderInfo cpi = i.next(); StringBuilder buf = new StringBuilder(128); - buf.append("Publishing provider "); + buf.append("Pub "); buf.append(cpi.authority); buf.append(": "); buf.append(cpi.name); |