am 50d4de21: Merge "Fix bug with display lists and layout." into honeycomb

* commit '50d4de21ee6a2ee62c7ad89dfdfd82d1045e7a58':
  Fix bug with display lists and layout.

core/java/android/view/View.java

@@ -10288,6 +10288,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
         }
 
         mPrivateFlags |= FORCE_LAYOUT;
+        mPrivateFlags |= INVALIDATED;
 
         if (mParent != null && !mParent.isLayoutRequested()) {
             mParent.requestLayout();
@@ -10301,6 +10302,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
      */
     public void forceLayout() {
         mPrivateFlags |= FORCE_LAYOUT;
+        mPrivateFlags |= INVALIDATED;
     }
 
     /**