OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
937b097
9cb060d
)
am 9cb060d0: am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock...
author
Adrian Roos
<roosa@google.com>
Mon, 31 Aug 2015 20:40:54 +0000
(20:40 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 31 Aug 2015 20:40:54 +0000
(20:40 +0000)
* commit '
9cb060d0c314630f6af89677263233f3253ad847
':
Disable fingerprint after force lock
Trivial merge