summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorOlawale Ogunwale <ogunwale@google.com>2015-04-07 04:15:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-07 04:15:58 +0000
commit94efe9172e4797fab1ab470d298cb62b7cd3ebe8 (patch)
tree6eb29db25470b7adb6080201cf25eaf585d8f3bd /rs/java/android/renderscript/RenderScript.java
parent78485e0fd11e2e06f1f2a95f7d693f8d3fff53a1 (diff)
parentbf39a6c6605764100a29f96c69bca6fb6f907fc3 (diff)
am bf39a6c6: am 43293fa8: am 437db610: Merge "[ActivityManager] Do not add service to reschedule after removing users."
* commit 'bf39a6c6605764100a29f96c69bca6fb6f907fc3': [ActivityManager] Do not add service to reschedule after removing users.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions