OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
997e93c
832ad72
)
am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device...
author
Paul Lawrence
<paullawrence@google.com>
Thu, 24 Jul 2014 21:52:43 +0000
(21:52 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 24 Jul 2014 21:52:43 +0000
(21:52 +0000)
* commit '
832ad7206299be6db94e82e2387c0fcf8df53e7e
':
Show countdown of remaining decrypt attempts before wiping device
Trivial merge