commit dd07aa072f0e8498e47956c26fa43a91c7835337
author Dianne Hackborn <hackbod@google.com> Wed Nov 30 14:16:20 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 30 14:16:20 2011 -0800
tree b999863d2d6fb63bc7a8d770141561ade13f7f95
parent 15540f8284b2f9a66ebeb28d441e1cde7423c41d
parent a5b8883b0db9d6e129b88f003b541fafd829c77b

am a5b8883b: am f8d20bd6: Merge "Turn off debug log." into ics-mr1

* commit 'a5b8883b0db9d6e129b88f003b541fafd829c77b':
  Turn off debug log.

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 367844d..b36ba3a 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -14249,7 +14249,7 @@
 
         if (app.curAdj != app.setAdj) {
             if (Process.setOomAdj(app.pid, app.curAdj)) {
-                if (true || DEBUG_SWITCH || DEBUG_OOM_ADJ) Slog.v(
+                if (DEBUG_SWITCH || DEBUG_OOM_ADJ) Slog.v(
                     TAG, "Set " + app.pid + " " + app.processName +
                     " adj " + app.curAdj + ": " + app.adjType);
                 app.setAdj = app.curAdj;