OSDN Git Service

am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5...
authorAdrian Roos <roosa@google.com>
Tue, 18 Mar 2014 21:47:18 +0000 (21:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Mar 2014 21:47:18 +0000 (21:47 +0000)
commit2d70a47b0e7196a58561195fc47a57085cf29633
treebd04adfe6a9ed6504e5e67f91f9b19210c3bd836
parentcdf008883921c2eb7daf10c82687e9a36461eb16
parenta4a1c0d4ee66f85376adbd71800e05b88b60c5b7
am a4a1c0d4: 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 'a4a1c0d4ee66f85376adbd71800e05b88b60c5b7':
  DO NOT MERGE - Fix keyguard pattern lockout bug