OSDN Git Service

am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern...
authorAdrian Roos <roosa@google.com>
Fri, 14 Mar 2014 16:32:12 +0000 (16:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 16:32:12 +0000 (16:32 +0000)
commitd590516b673e1a319099d8d009706d42a61877e0
tree147ebdc3659835eed079ec3fa8c4d39445252f80
parent634925222ad4528984bf35b9b2316db9a227d51c
parent70a0ea0e8de981a2a0c3fb296718256a2355ee2d
am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev

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