commit b28e2f2908c327c3cbc22dbcb674b2a5037edf77
author The Android Automerger <android-build@google.com> Thu Jun 06 05:55:43 2013 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 06 05:55:43 2013 -0700
tree d0173c1d10f29ba6f2a5d660e1e1a32478dc0ec4
parent 6c604d616ff796f1ec41d4ad7212729cf469e8f5
parent 570c42b6c181a5b3b73ff613b3d909b37baa28eb

merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

src/com/android/camera/PhotoUI.java

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index a364d79..68507f4 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -107,9 +107,9 @@
                 w = height;
                 h = width;
             }
-            if (mPreviewWidth != w || mPreviewHeight != h) {
-                mPreviewWidth = w;
-                mPreviewHeight = h;
+            if (mPreviewWidth != width || mPreviewHeight != height) {
+                mPreviewWidth = width;
+                mPreviewHeight = height;
                 mController.onScreenSizeChanged(width, height, w, h);
             }
         }