diff options
| author | Chris Craik <ccraik@google.com> | 2015-07-14 17:49:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 17:49:47 +0000 |
| commit | 9f43ac777a0a5325002cabc37cb32a255eebe522 (patch) | |
| tree | efe0b7926515acd033cb51972a88c89ecbc04084 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 21a0f80f87873ee1239ee02113475adb82af6a6c (diff) | |
| parent | e2a5c184e396b748e390672996ebeca25c2b9b83 (diff) | |
am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit 'e2a5c184e396b748e390672996ebeca25c2b9b83':
Fix unsafety in SkiaShader storage, and texture unit accounting
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions