diff options
| author | Selim Cinek <cinek@google.com> | 2015-07-25 16:14:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 16:14:11 +0000 |
| commit | e756d912fe61a5894c686fcee943b3109cf6a5df (patch) | |
| tree | 1bbe092a83e12eb80927b68b69b43c0035e94f18 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6331c6cacc7464d5bcbaa345499064e48e8a64cf (diff) | |
| parent | d2e40fabcaddb9c32e0ddaaea8f45519a7d810d5 (diff) | |
am d2e40fab: am 8588b331: am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
* commit 'd2e40fabcaddb9c32e0ddaaea8f45519a7d810d5':
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