summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-08-12 21:13:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-12 21:13:05 +0000
commit1a7e5ad0e7149c8e095c0fb27315733511321fd7 (patch)
tree6fc3032b10018adecea8d45cc0f906a3151f6bb7 /rs/java/android/renderscript/RenderScript.java
parent379135d3d0f5cd5ca021c2d456370435362b3387 (diff)
parent67fe6d1f76a740147cc9c85487e8e70b53c744f8 (diff)
am 67fe6d1f: Merge "Revert "Fix a bug: unable to start activity when AM is killing the process.""
* commit '67fe6d1f76a740147cc9c85487e8e70b53c744f8': Revert "Fix a bug: unable to start activity when AM is killing the process."
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions