diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-13 01:02:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 01:02:31 +0000 |
| commit | 73d9e1ce0bc8e4478b165fd5f550c99830fbcb57 (patch) | |
| tree | f8b49e0c5199ce5041b7ded6ec9d82b0785b6df5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a54d4583ec4d6b112a99c29ef71fbabfd67478cb (diff) | |
| parent | 69082a298f50680128ada89a8bef777f0fadf829 (diff) | |
am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev
* commit '69082a298f50680128ada89a8bef777f0fadf829':
Require strong authentication after a timeout
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions