Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 5589244..5d82d79 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -13787,7 +13787,7 @@
         }
 
         if ((flags & ViewGroup.FLAG_CLIP_CHILDREN) == ViewGroup.FLAG_CLIP_CHILDREN &&
-                !useDisplayListProperties && layerType == LAYER_TYPE_NONE) {
+                !useDisplayListProperties && cache == null) {
             if (offsetForScroll) {
                 canvas.clipRect(sx, sy, sx + (mRight - mLeft), sy + (mBottom - mTop));
             } else {