resolved conflicts for merge of 18e3727f to master

Change-Id: I3d74db13f163ac3f23955b6c7d8469e7a8f93066

core/java/android/view/GLES20Canvas.java

@@ -216,7 +216,7 @@ class GLES20Canvas extends HardwareCanvas {
     ///////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void callDrawGLFunction(long drawGLFunction) {
+    public void callDrawGLFunction2(long drawGLFunction) {
         nCallDrawGLFunction(mRenderer, drawGLFunction);
     }
 

core/java/android/view/HardwareCanvas.java

@@ -98,7 +98,7 @@ public abstract class HardwareCanvas extends Canvas {
      *
      * @hide
      */
-    public void callDrawGLFunction(long drawGLFunction) {
+    public void callDrawGLFunction2(long drawGLFunction) {
         // Noop - this is done in the display list recorder subclass
     }
 

core/java/android/webkit/WebViewDelegate.java

@@ -107,7 +107,7 @@ public final class WebViewDelegate {
             throw new IllegalArgumentException(canvas.getClass().getName()
                     + " is not hardware accelerated");
         }
-        ((HardwareCanvas) canvas).callDrawGLFunction(nativeDrawGLFunctor);
+        ((HardwareCanvas) canvas).callDrawGLFunction2(nativeDrawGLFunctor);
     }
 
     /**