OSDN Git Service

am c02a09aa: Merge "Fix 2594148: confirm PIN/Password before resetting device" into...
authorJim Miller <jaggies@google.com>
Wed, 14 Apr 2010 23:30:49 +0000 (16:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Apr 2010 23:30:49 +0000 (16:30 -0700)
commit02b576205f7fc7957c3895e1fb8846aefc5155b1
tree238d631ee8e96528658c3b529fc9cc5c81db73f0
parentbbeb73656c81ff51a2aa962dbc2ecdbe3260e7da
parentc02a09aa565318f37d9481d05d50610fe722e4b4
am c02a09aa: Merge "Fix 2594148: confirm PIN/Password before resetting device" into froyo

Merge commit 'c02a09aa565318f37d9481d05d50610fe722e4b4' into kraken

* commit 'c02a09aa565318f37d9481d05d50610fe722e4b4':
  Fix 2594148: confirm PIN/Password before resetting device