diff options
| author | Matthew Fritze <mfritze@google.com> | 2016-07-21 00:59:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-21 00:59:28 +0000 |
| commit | bfd3b34ba6ad52b288322dfb043ca2de21d2a063 (patch) | |
| tree | 6aaebc0e46b03af6cbc87583373df9446817d247 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 89cfd1719625dce38f4b9112e0ffeb1e8ab1b874 (diff) | |
| parent | 85d688cd79f269748a5165aa990ab12150621a82 (diff) | |
Merge \\"Error colors to point to frameworks rather than hard-code them\\" into nyc-mr1-dev am: 948400a43d
am: 85d688cd79
Change-Id: I214563e1cd9ad44c99ea34c5480bc7ab1814a975
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions