From: Adrian Roos <roosa@google.com>
Date: Thu, 3 Apr 2014 14:45:34 +0000 (+0000)
Subject: am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am... 
X-Git-Tag: android-x86-6.0-r1~2113^2^2^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0b55caf01af1efa15ff0bfbf50a1726fce788660;p=android-x86%2Fpackages-apps-Settings.git

am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit 'a52a37b0fe17109877abbc25943d0d74232f3e5f':
  Add lockout after trying to enter PIN / Password too often
---

0b55caf01af1efa15ff0bfbf50a1726fce788660