SystemUI: Fix merge error

Change-Id: I1192c891f1b287306f5ff4b24a281ea22323af88
Signed-off-by: Mike Lockwood <lockwood@google.com>

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

@@ -293,9 +293,9 @@ public class NavigationBarView extends LinearLayout {
                         mCurrentView.getWidth(), mCurrentView.getHeight(),
                         visibilityToString(mCurrentView.getVisibility())));
 
-        pw.println(String.format("      disabled=0x%08x vertical=%s hidden=%s low=%s menu=%s",
+        pw.println(String.format("      disabled=0x%08x portrait=%s hidden=%s low=%s menu=%s",
                         mDisabledFlags,
-                        mVertical ? "true" : "false",
+                        mNaturallyPortrait ? "true" : "false",
                         mHidden ? "true" : "false",
                         mLowProfile ? "true" : "false",
                         mShowMenu ? "true" : "false"));