diff options
| author | Adrian Roos <roosa@google.com> | 2016-08-11 02:51:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-11 02:51:15 +0000 |
| commit | 4ec878e8a8661aabea7e4c6e522f8df6622de449 (patch) | |
| tree | 26fba074e261893c43bdfb5d02e44190ffaa7792 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 367e0761c5af88b3b82ffd1c62bad374f40514e0 (diff) | |
| parent | 16d2c267cbbd733008253ff0a95852ad5326a2b0 (diff) | |
Merge "Only disable trust agents after lockout" into nyc-mr1-dev am: f6487b63a1 am: dc915e418b
am: 16d2c267cb
Change-Id: I55cc92dbefcba1188f28126fe48d60f549c735d9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions