diff options
| author | Adrian Roos <roosa@google.com> | 2015-08-31 20:27:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 20:27:55 +0000 |
| commit | 9cb060d0c314630f6af89677263233f3253ad847 (patch) | |
| tree | c2300b809605710cc0f6e76ac0f603d87af2a768 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | aaebdd7f91163382065d3b56d57cafef5e46c7fd (diff) | |
| parent | 7e1775d246371422ae60ec4d825d70bc067a8962 (diff) | |
am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit '7e1775d246371422ae60ec4d825d70bc067a8962':
Disable fingerprint after force lock
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions