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:
fcc5aaf
a0ee004
)
am 6f6fcecb: Bug 16152902: Disabling FUL in keyguard and screen lock settings
author
Brian Colonna
<bcolonna@google.com>
Thu, 17 Jul 2014 18:17:55 +0000
(18:17 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 17 Jul 2014 18:17:55 +0000
(18:17 +0000)
* commit '
6f6fcecb4e13e5cbfb836b66e49001e34bd0c10c
':
Bug
16152902
: Disabling FUL in keyguard and screen lock settings
Trivial merge