diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2016-07-21 01:37:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-21 01:37:38 +0000 |
| commit | 258b2c3fa42c6e66bc920ab6abfaf51ebcfa0c37 (patch) | |
| tree | ca7f5466c8c43da91a7c73b745dcc28bdff5f34e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cf3e1a7fa847e6895c3bc8d9549d2ed9ce736608 (diff) | |
| parent | aa79a3c1359f27e74f02d10ad20daec5f7c280a5 (diff) | |
Merge \\"Revert \\"Error colors to point to frameworks rather than hard-code them\\"\\" into nyc-mr1-dev am: 22d09743d8
am: aa79a3c135
Change-Id: I53e9a848b90254c2bafd84342293265f7c6997b5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions