Commits
Adrian Roos authored and Android Git Automerger committed a4a1c0d4ee6M
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
Showing diff to965e5e8520d