diff options
author | Jeremy Joslin <jjoslin@google.com> | 2017-01-11 01:59:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-11 01:59:48 +0000 |
commit | dcfc8f363a4c87e5e3366d7319385ec159fc113f (patch) | |
tree | 824aec6c388bbd815de571e34b031fd84dcf59b4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6720e223a8de9646870aeb44ec210afba7efa616 (diff) | |
parent | 99ca0df8d4ccb2bc3442e4c48d4922b7aa88e36d (diff) |
Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196 am: 5fbd2791ac am: 11b1311e21
am: 99ca0df8d4 -s ours
Change-Id: I735bd4d65c5764a3a7d6d288d45a57ec1ea98638
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions