diff options
| author | Matthew Fritze <mfritze@google.com> | 2016-07-21 01:24:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-21 01:24:02 +0000 |
| commit | 250664a032935857af39878915c90cc3ef910200 (patch) | |
| tree | b3348af0e2af1937f4ec317971714c153f9836df /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | aa79a3c1359f27e74f02d10ad20daec5f7c280a5 (diff) | |
| parent | 9e7bd8de879ba78e3c3b80f1324b9a48a0921dff (diff) | |
Merge \"Revert \"Revert \"Error colors to point to frameworks rather than hard-code them\"\"\" into nyc-mr1-dev
am: 9e7bd8de87
Change-Id: Ie9d9f4864c0e85375dace272cb9e389b3f02c573
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions