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