summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorTomasz Mikolajewski <mtomasz@google.com>2016-04-20 04:03:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-20 04:03:25 +0000
commit37e080e3f09f0f8f4706a9c58033a260deb4449f (patch)
tree062117a16a5e414d2b18a1826aaac2695dff4d4d /rs/java/android/renderscript/RenderScript.java
parent68852d1776a746d520c08c86255e6bd31b17fe9b (diff)
parent0fb51357afb64a034a59f68a926f79d18213c72c (diff)
Merge changes I5e500724,I40cfb12c into nyc-dev
am: 0fb5135 * commit '0fb51357afb64a034a59f68a926f79d18213c72c': Restrict selection to 1000 items in DocumentsUI. Cancel band selection on directory change. Change-Id: Ia38b188789483ee24469f4091c44c5d059ae402d
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions