Merge change 6372 into donut

* changes:
  Fixes #1963217. Increases the invalidate region in compatibility mode.

core/java/android/view/ViewRoot.java

@@ -546,13 +546,16 @@ public final class ViewRoot extends Handler implements ViewParent,
         if (DEBUG_DRAW) Log.v(TAG, "Invalidate child: " + dirty);
         if (mCurScrollY != 0 || mTranslator != null) {
             mTempRect.set(dirty);
+            dirty = mTempRect;
             if (mCurScrollY != 0) {
-               mTempRect.offset(0, -mCurScrollY);
+               dirty.offset(0, -mCurScrollY);
             }
             if (mTranslator != null) {
-                mTranslator.translateRectInAppWindowToScreen(mTempRect);
+                mTranslator.translateRectInAppWindowToScreen(dirty);
+            }
+            if (mAttachInfo.mScalingRequired) {
+                dirty.inset(-1, -1);
             }
-            dirty = mTempRect;
         }
         mDirty.union(dirty);
         if (!mWillDrawSoon) {