summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-09-20 06:32:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-20 06:32:39 +0000
commit5753af889b87f90725d40ee9b0390ef7f69530ee (patch)
treee93fd5ba1bcdf9e6b67bb798e21b9cc3c28a11dd /rs/java/android/renderscript/RenderScript.java
parent8d302da986ba7d0916a9fdf73aa03b921c686fc2 (diff)
parent62c6ce4ca0626ad5432ee1b341e6367118a876ba (diff)
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9
am: 62c6ce4ca0 Change-Id: I1d0c04e3c4382f395d10034343240e1bf4bca68f
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions