commit 48ba506dfa591d0bcd79a088457eb95a9bd4c575
author Stephen Hines <srhines@google.com> Wed Jul 09 07:39:38 2014 -0700
committer Stephen Hines <srhines@google.com> Wed Jul 09 07:39:38 2014 -0700
tree fdef187efdaa55a0f67a4fb5e1d553d358a10f4a
parent f32b3de8c931060875ed6fa1dbb87b67048d8552
parent 31012e2cef3f36183bcfd243278e969b29360c3e

resolved conflicts for merge of 31012e2c to master

Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b

rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java

diff --git a/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
index 0357560..2d37600 100644
--- a/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
@@ -107,7 +107,7 @@
      *             type.
      */
     public void forEach(Allocation aout) {
-        forEach(aout, null);
+        forEach(0, (Allocation) null, aout, null);
     }
 
     /**
@@ -119,7 +119,7 @@
      * @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);
     }
 
 
@@ -141,4 +141,3 @@
         return createFieldID(1, null);
     }
 }
-