diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-06-26 23:53:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-26 23:53:47 +0000 |
| commit | cfbe2474c1f07f542ff6f424aa6fe8e53a6ac3a2 (patch) | |
| tree | 03fdd2d60bf7afb3af598e90d82b02de60437ceb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c815d700d573696ddecd83b3fcd35b057a72bba5 (diff) | |
| parent | a1c98021c04325a10d9da5c49feb115bec6e4912 (diff) | |
am a1c98021: am 293facf4: (-s ours) am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit 'a1c98021c04325a10d9da5c49feb115bec6e4912':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions