diff options
| author | Adrian Roos <roosa@google.com> | 2017-08-18 16:50:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-18 16:50:02 +0000 |
| commit | 54a6ee28d0e5c876399cf4590c5da7bf0223cf87 (patch) | |
| tree | ade21ceb139cdf65762865ad2edd708fbf1c93d0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0f9774e1d9c995bcf7a21bf5edeb77a2e123c45f (diff) | |
| parent | dd4e76b6873d89e634ac79a7e9cbf0aedb115013 (diff) | |
Merge "LockSettings: Enforce permission check on havePattern/havePassword/systemReady" into oc-mr1-dev am: 713a92390e
am: dd4e76b687
Change-Id: I753cd906156779c7658812b5f6378d214d4f1de7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions