OSDN Git Service

am d590516b: am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguar...
authorAdrian Roos <roosa@google.com>
Fri, 14 Mar 2014 16:35:59 +0000 (16:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 16:35:59 +0000 (16:35 +0000)
commit1b2a09d4d42e7a2406ac9c25b7cedd8880f25643
tree9a076f3ea743bf37a62ae88e3c44f0f2ca28c7c1
parent40716d95ad377a76f14a89b90319e4e9650b5963
parentd590516b673e1a319099d8d009706d42a61877e0
am d590516b: am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev

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