resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp

Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d
2010-08-23 14:20:47 -07:00
parent 360ab1dfb4 1ffd753ee0
commit 026231284c
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/app/ShutdownThread.java
+++ b/core/java/com/android/internal/app/ShutdownThread.java
@@ -134,7 +134,7 @@ public final class ShutdownThread extends Thread {
    private static void beginShutdownSequence(Context context) {
        synchronized (sIsStartedGuard) {
            if (sIsStarted) {
-                Log.d(TAG, "Request to shutdown already running, returning.");
+                Log.d(TAG, "Shutdown sequence already running, returning.");
                return;
            }
            sIsStarted = true;