| commit | 16858164c73f0696d12161e97bad9cb22c55e603 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Mar 13 17:26:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 17:26:26 2014 +0000 |
| tree | 6b251a47b8447e042f86eb56266e048a9d72c73a | |
| parent | a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5 [diff] | |
| parent | cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440 [diff] |
am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev * commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440': DO NOT MERGE - Fix keyguard pattern lockout bug