summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2015-04-13 05:06:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-13 05:06:30 +0000
commit0a9bce976ae6f46cbd0e75cc857480c4d117acad (patch)
treed7d5dfffb5a882606b5b5d70bc7ee7785897b742 /rs/java/android/renderscript/RenderScript.java
parentfe4d95c3fc81a280e779bbe3d34431b6dc857350 (diff)
parent110919d9952a60eb9a2ff1696f3e13818428ee6a (diff)
am 110919d9: am bd59764a: am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider"
* commit '110919d9952a60eb9a2ff1696f3e13818428ee6a': Clean-up state if we have an exception when acquiring provider
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions