summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Script.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-13 17:37:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-13 17:37:28 +0000
commitbd7cabf08a20657d8624fbf946513aecff3e06a3 (patch)
treea31ef97bbd7f5ff207ba2c27470cb2397c2aafce /rs/java/android/renderscript/Script.java
parent3b238675bcd670d8a6d850750608d28396ef2d56 (diff)
parent77e6dbf1decbe8572384d94522c7adcbdc3e4d59 (diff)
Merge "Prevent trimming recent tasks belonging in different stacks. am: 29dbc3cc47 am: 4a119bc588" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions