diff options
| author | Nancy Zheng <nzheng@google.com> | 2016-11-21 12:58:16 -0800 |
|---|---|---|
| committer | Nancy Zheng <nzheng@google.com> | 2016-11-21 12:58:16 -0800 |
| commit | 40cd8e410db8e9d78e5aef222c498a7c2dbf2dd4 (patch) | |
| tree | 953876d9122c1b133afa984eb77d759f8375b16c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 66f6547ba9e0ae1167e1701b9ec59b044370b4a0 (diff) | |
| parent | 2a12d8520ea6f41bd2db8577a8da82204e341c51 (diff) | |
Merge commit '2a12d8520ea6f41bd2db8577a8da82204e341c51' into manual_merge_2a12d85
Test: compiled everything, CTS verifier passes
Change-Id: I96641860890e413342bcb6a3b24e87d6aeff0c99
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions