summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-11 01:05:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-11 01:05:23 +0000
commit12ef838c98fe0360e7f67d94c16e80acc84bf304 (patch)
tree196292c9b14e4fced7bdf810d4a1927b820641f7 /rs/java/android/renderscript/RenderScript.java
parentcd2af8a35d8e44792e38adccb9d7fdf6c1c74ce0 (diff)
parentafaede60c06c56b45bca31fdfc6f4b38de7da24b (diff)
Merge "Merge \\"Place a black layer behind SurfaceView.\\" into nyc-dev am: 0360a900f7 am: 2eeceeed3a" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions