Merge "Fix debug log." into jb-mr1-dev

Author: Dianne Hackborn

services/java/com/android/server/wm/DisplayContent.java

@@ -124,7 +124,9 @@ public void dump(PrintWriter pw) {
         pw.print("-"); pw.print(mDisplayInfo.largestNominalAppWidth);
         pw.print("x"); pw.println(mDisplayInfo.largestNominalAppHeight);
         pw.print("  layoutNeeded="); pw.println(layoutNeeded);
-        pw.print("magnificationSpec="); pw.println(mMagnificationSpec);
+        if (mMagnificationSpec != null) {
+            pw.print("  mMagnificationSpec="); pw.println(mMagnificationSpec);
+        }
         pw.println();
     }
 }