OSDN Git Service

am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937...
authorAdrian Roos <roosa@google.com>
Tue, 18 Mar 2014 20:47:58 +0000 (13:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Mar 2014 20:47:58 +0000 (13:47 -0700)
commit88da2bfaacaafebdd2e0fb9542386486b9594871
tree6723df81e6b9b9a55da1a5cfdf540a3ffc48ac35
parent1066fc61a371443e9423f890f6f7615f2d1e4c6c
parented529a5a78ade4833a8fd2ddfaf88d68ca260e6b
am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit 'ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
  DO NOT MERGE - Fix keyguard pattern lockout bug