diff options
author | Adrian Roos <roosa@google.com> | 2017-07-06 16:24:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 16:24:43 +0000 |
commit | 7ba5f8e2ec4b15be2c99e4406993a57291d25efc (patch) | |
tree | 04466595dee4f5c1758f3e4baa25ac21a48743f5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5b0a2266bfb8f2f9a3dcb91486fd1ec88cf583d3 (diff) | |
parent | 9731c8bfef7c1520b8aaa999ef7d81caeabacf00 (diff) |
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
am: 9731c8bfef
Change-Id: I3fff6c1d14b6611a8e2700bc5b6cafcbd2420fa0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions