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