OSDN Git Service

am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours...
authorAdrian Roos <roosa@google.com>
Tue, 18 Mar 2014 21:07:28 +0000 (21:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Mar 2014 21:07:28 +0000 (21:07 +0000)
commita4a1c0d4ee66f85376adbd71800e05b88b60c5b7
tree270a4ee02eabe9d46841da5217b4c83eeb29bf1c
parent965e5e8520d040ce7e064db665982eb98c626b2b
parentac275cb3d8184e83228899280bb8901e30f3a5f2
am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

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