commit 46089bd1cb031c578735707712cf9574678032fe
author Jean-Baptiste Queru <jbq@google.com> Tue Aug 24 11:22:05 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 24 11:22:05 2010 -0700
tree db57e3a0a02f8f74759c1b823dc577c1eb9fce02
parent 5f981d97e72a5e254dae409de5a259fd2b2746e7
parent 026231284c44ca8cf789e0d5045c5ae6a91d7766

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

Merge commit '026231284c44ca8cf789e0d5045c5ae6a91d7766'

* commit '026231284c44ca8cf789e0d5045c5ae6a91d7766':
  Crash when powering off.

core/java/com/android/internal/app/ShutdownThread.java

diff --git a/core/java/com/android/internal/app/ShutdownThread.java b/core/java/com/android/internal/app/ShutdownThread.java
index d1aff2a..e07c54f 100644
--- a/core/java/com/android/internal/app/ShutdownThread.java
+++ b/core/java/com/android/internal/app/ShutdownThread.java
@@ -134,7 +134,7 @@
     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;