summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorDave Platt <dplatt@google.com>2014-03-04 22:06:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-04 22:06:56 +0000
commitbf588bda2c4dc98919439946e905e98ad4d352dd (patch)
treee52bc1e5a6c82438d370757553000fde480c2676 /rs/java/android/renderscript/RenderScript.java
parent2faf28cf85232d9eee0926c05c941c53381d4161 (diff)
parentf08cd8c656c4ea6a8c7bf8bafa3f8de72578ebca (diff)
am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"
* commit 'f08cd8c656c4ea6a8c7bf8bafa3f8de72578ebca': Harden NsdManager against null-dereference crashes
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions