diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-06-26 23:26:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-26 23:26:40 +0000 |
| commit | b0001f1bd9030ec81471055e1ffdc6609111bad3 (patch) | |
| tree | 0457d1c15717a788071da04ba12dd94819b2a9d4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b8c516f3d7ba804b930fc67a6835e18080411a07 (diff) | |
| parent | 37b4546ec052c18f04fe2881e36e3fe38e564780 (diff) | |
am 37b4546e: am 1573d8ef: (-s ours) am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '37b4546ec052c18f04fe2881e36e3fe38e564780':
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