diff options
| author | Bob Badour <bbadour@google.com> | 2019-06-12 15:56:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-12 15:56:48 -0700 |
| commit | 5e4eb524226fb9a9c17838cfafc834059a00b3af (patch) | |
| tree | 61ec383fec107b98f8c3adecdb172dba094d3886 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 302d0d45d2bd6678ac052c11c8d64b9d3dbf2d6f (diff) | |
| parent | 3e4dd234e7f0275550849ae5162cdcbb658e16fa (diff) | |
Merge "Clarify license terms for Romain Guy's artwork." am: 11d96c6de8
am: 3e4dd234e7
Change-Id: I5c2ec271babc92ac7bd46863fa03760e80afc170
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions