Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 31012e2c to master

Browse Source 
Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
This commit is contained in:
Stephen Hines
2014-07-09 07:39:38 -07:00
parent f32b3de8c9 31012e2cef
commit 48ba506dfa
8 changed files with 176 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
View File

@@ -107,7 +107,7 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic {
* type.
*/
public void forEach(Allocation aout) {
forEach(aout, null);
forEach(0, (Allocation) null, aout, null);
}
/**
@@ -119,7 +119,7 @@ public final class ScriptIntrinsicConvolve5x5 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);
}
@@ -141,4 +141,3 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic {
return createFieldID(1, null);
}
}