OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
666e389
edc3505
)
am b32f5037: Merge "resolved conflicts for merge of 1a783be3 to master"
author
Jim Miller
<jaggies@google.com>
Fri, 18 Nov 2011 22:47:07 +0000
(14:47 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 18 Nov 2011 22:47:07 +0000
(14:47 -0800)
* commit '
b32f5037e9870a2dc7034b6c6a95f903dc2a1f0c
':
Fix
5636798
: clear PIN/PUK fields when device sleeps or user cancels
Trivial merge