diff options
author | Jeremy Joslin <jjoslin@google.com> | 2017-05-03 23:05:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-03 23:05:51 +0000 |
commit | 8cc43b6fa7c1bb8a0510ca6eb387eaa5b95f38c4 (patch) | |
tree | 813ca0c637dfeefe2aee86f1b84ce5d69d9a61d4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6ea58fad63b02c2d2f02a4b9e626d3c37f875e41 (diff) | |
parent | d05dda1d40e2867825e6e4b35986f9c4ca1e98cf (diff) |
Merge changes from topic 'allow_none_scorer' into oc-dev
am: d05dda1d40
Change-Id: I90864d95416167384c7acb9ac3d6beb8e523b682
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions