resolved conflicts for merge of 31012e2c to master

Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b

1 files changed, 2 insertions, 3 deletions

diff --git a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
index fb91fdceddd9..76da781004d8 100644
--- a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
@@ -106,7 +106,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic {
      *             type.
      */
     public void forEach(Allocation aout) {
-        forEach(aout, null);
+        forEach(0, (Allocation) null, aout, null);
     }
 
     /**
@@ -118,7 +118,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic {
      * @param opt LaunchOptions for clipping
      */
     public void forEach(Allocation aout, Script.LaunchOptions opt) {
-        forEach(0, null, aout, null, opt);
+        forEach(0, (Allocation) null, aout, null, opt);
     }
 
     /**
@@ -140,4 +140,3 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic {
     }
 
 }
-