OSDN Git Service

am b32f5037: Merge "resolved conflicts for merge of 1a783be3 to master"
authorJim Miller <jaggies@google.com>
Fri, 18 Nov 2011 22:47:07 +0000 (14:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Nov 2011 22:47:07 +0000 (14:47 -0800)
commitdca227eaf6f813476035418fea775006d9bc2977
treea20020751e6a69c9d7eefe38f9bcfea79f83ad99
parent666e389b34c58d2da5f7153a5cc335606a35f755
parentedc350504ea9ef4000e6a83230dc76119bb75892
am b32f5037: Merge "resolved conflicts for merge of 1a783be3 to master"

* commit 'b32f5037e9870a2dc7034b6c6a95f903dc2a1f0c':
  Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels