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:
2d96295
b80b8bb
)
am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for...
author
Amith Yamasani
<yamasani@google.com>
Tue, 23 Oct 2012 00:59:10 +0000
(17:59 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 23 Oct 2012 00:59:10 +0000
(17:59 -0700)
* commit '
b80b8bb2535504bada0664a7255b5fa61c2c3947
':
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
Trivial merge