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:
bbeb736
c02a09a
)
am c02a09aa: Merge "Fix 2594148: confirm PIN/Password before resetting device" into...
author
Jim Miller
<jaggies@google.com>
Wed, 14 Apr 2010 23:30:49 +0000
(16:30 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 14 Apr 2010 23:30:49 +0000
(16:30 -0700)
Merge commit '
c02a09aa565318f37d9481d05d50610fe722e4b4
' into kraken
* commit '
c02a09aa565318f37d9481d05d50610fe722e4b4
':
Fix
2594148
: confirm PIN/Password before resetting device
Trivial merge