Merge "Work around a possible driver bug Bug #7296475" into jb-mr1-dev

Author: Romain Guy

libs/hwui/Caches.cpp

@@ -418,6 +418,7 @@ bool Caches::enableScissor() {
     if (!scissorEnabled) {
         glEnable(GL_SCISSOR_TEST);
         scissorEnabled = true;
+        resetScissor();
         return true;
     }
     return false;