summaryrefslogtreecommitdiffstats
path: root/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 31012e2c to masterStephen Hines2014-07-091-3/+2
|\
| * Adds support for multi-input kernels to Frameworks/Base/RS.Chris Wailes2014-07-071-2/+1
| * Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray2014-01-311-0/+133
* Add clipping for intrinsics.Tim Murray2014-01-131-1/+13
* Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray2013-12-171-0/+131