summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-03-19 05:31:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-19 05:31:11 +0000
commit99842c0018241ca3c0ec05c88dc57a21f24fb405 (patch)
tree82055690ac6f08bc62728b5378d40cf2bbec6bdd /rs/java/android/renderscript/RenderScript.java
parentaf1fd4e28de6cb39647a52e66887584e3a44991d (diff)
parent7e7f3658b90da46ae8b44577420ebd6ee0e9ffa1 (diff)
am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
* commit '7e7f3658b90da46ae8b44577420ebd6ee0e9ffa1': Revert "Doc change: add docs for SafetyNet API."
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions