summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2015-03-05 06:18:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-05 06:18:45 +0000
commit4f674bbdf83056141f3dccf1af8af3113e17af87 (patch)
tree52d2a2d9bffc8eba010ec34a3fdea6a943c05e29 /rs/java/android/renderscript/RenderScript.java
parent28d11557d6846e7ea7fb2593a6ed4d3a16f5eef6 (diff)
parent8b2be54a629e4567152d8b0e6c81332632b0b877 (diff)
am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '8b2be54a629e4567152d8b0e6c81332632b0b877': add tags for wakelock and other API names
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions