diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-06-30 19:45:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-30 19:45:08 +0000 |
| commit | 22766e85d8b7bbedaa28a409f34120c4f3d4a2d3 (patch) | |
| tree | da7ebbaf42e31deb8f3a84549b9f6146490f6426 /rs/java/android/renderscript/RenderScript.java | |
| parent | 88c2d704c3bbb58a676b4b1164b1c98aecdf467d (diff) | |
| parent | bcf9223b3bbe542d0ab040398c26cf1c600f5493 (diff) | |
am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit 'bcf9223b3bbe542d0ab040398c26cf1c600f5493':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions