diff options
| author | Xin Li <delphij@google.com> | 2016-10-13 13:51:19 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2016-10-13 13:51:42 -0700 |
| commit | ee2903686f9566a0563bdb7a263ab58454c2634a (patch) | |
| tree | 81b94d15afa4ed0045559fff49d13ad32d6db6c1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2cd4383c316b894bd10191f64c1394df1d2c1b0d (diff) | |
| parent | df1b6d2f58a7de3c7d9bfd612cf9aeeea1f25990 (diff) | |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into
marshmallow-dev" into mnc-dev.
Change-Id: I7215eebd4a2cc9a4b6ccf2a3e36ed8edc556d208
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions