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