diff options
| author | Selim Cinek <cinek@google.com> | 2015-07-25 00:33:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-25 00:33:14 +0000 |
| commit | f8acd1d8d698f367bc267699a0a84c21f7c7d548 (patch) | |
| tree | 9121c766d45edbd0c6e9b91d64e1d32d8cf67582 /services/java/com/android/server/SystemServer.java | |
| parent | c174de0ab353e2ecaf6e1728e6899bffcfefe48e (diff) | |
| parent | 1fcafc49ad34cb8f778862653d452ac0fe61461c (diff) | |
| download | frameworks_base-f8acd1d8d698f367bc267699a0a84c21f7c7d548.zip frameworks_base-f8acd1d8d698f367bc267699a0a84c21f7c7d548.tar.gz frameworks_base-f8acd1d8d698f367bc267699a0a84c21f7c7d548.tar.bz2 | |
Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
0 files changed, 0 insertions, 0 deletions