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:
67b2039
345d9dd
)
am fb9e3643: Merge "Fix 5620754: don\'t show pattern unlock after SIM unlock if not...
author
Jim Miller
<jaggies@google.com>
Thu, 26 Jan 2012 22:34:08 +0000
(14:34 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 26 Jan 2012 22:34:08 +0000
(14:34 -0800)
* commit '
fb9e364380f91295490d1acbfc9a571cb6a4384b
':
Fix
5620754
: don't show pattern unlock after SIM unlock if not enabled.
Trivial merge