diff options
| author | Matthew Fritze <mfritze@google.com> | 2016-07-20 23:47:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-20 23:47:23 +0000 |
| commit | 85d688cd79f269748a5165aa990ab12150621a82 (patch) | |
| tree | b213640e66db2b4c6039ebcaa26b01f85c8a3408 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 96b91f692b9496e1a6e6c9744b704c7710a2ec77 (diff) | |
| parent | 948400a43dcb3e830116b36c2ed46e87129b815e (diff) | |
Merge \"Error colors to point to frameworks rather than hard-code them\" into nyc-mr1-dev
am: 948400a43d
Change-Id: Ibeca72659bbd13b1a5a8bdb009fc6a5021f8acbf
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions