diff options
| author | Selim Gurun <sgurun@google.com> | 2014-05-01 23:04:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 23:04:59 +0000 |
| commit | b94d412848653ae532e589c2a7479b0d0149d341 (patch) | |
| tree | 6c5100f87395200c4990d3b015c81ca26e7e3c1f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 85a3c8a5b774a9e2fa6b88f3a870eb7d1b923769 (diff) | |
| parent | 1bf2bed1507872dbc5cdefef6f6d3e5a7f83daa2 (diff) | |
am 1bf2bed1: (-s ours) am e1a56162: (-s ours) am 83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
* commit '1bf2bed1507872dbc5cdefef6f6d3e5a7f83daa2':
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions