diff options
author | Adrian Roos <roosa@google.com> | 2017-07-07 19:12:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-07 19:12:31 +0000 |
commit | f53f45e06f893d859b2596462fba66a17cb77d99 (patch) | |
tree | 2a0464fc7b1810facc4745dabe9b143eb65f2305 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f627f51b4f51aa49ab56540543004fde1f7f5a53 (diff) | |
parent | eacef7a03a4d011b01102ab8e2edd8eb82b2e7af (diff) |
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev
am: eacef7a03a
Change-Id: I8e29473caf7c1cbef065909b0b40212b82648a95
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions