diff options
| author | Selim Cinek <cinek@google.com> | 2015-07-25 00:59:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 00:59:57 +0000 |
| commit | 8588b3317c848e93998616c981f8c997197b4222 (patch) | |
| tree | 8d25a99898f1d1d02088bef287fffa6c1a95be0c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 67b4db0c5401ab81359fe145efcc91173154cae8 (diff) | |
| parent | f8acd1d8d698f367bc267699a0a84c21f7c7d548 (diff) | |
am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
* commit 'f8acd1d8d698f367bc267699a0a84c21f7c7d548':
Adapted the behavior when unlocking with fingerprint is not allowed
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions