resolved conflicts for merge of 31012e2c to master

Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
2014-07-09 07:39:38 -07:00
parent f32b3de8c9 31012e2cef
commit 48ba506dfa
8 changed files with 176 additions and 13 deletions
--- a/rs/java/android/renderscript/ScriptIntrinsicResize.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicResize.java
@@ -95,7 +95,7 @@ public final class ScriptIntrinsicResize extends ScriptIntrinsic {
     * @param opt LaunchOptions for clipping
     */
    public void forEach_bicubic(Allocation aout, Script.LaunchOptions opt) {
-        forEach(0, null, aout, null, opt);
+        forEach(0, (Allocation) null, aout, null, opt);
    }

    /**
@@ -109,4 +109,3 @@ public final class ScriptIntrinsicResize extends ScriptIntrinsic {


 }
-