OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e23823 a52a37b)
am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am...
authorAdrian Roos <roosa@google.com>
Thu, 3 Apr 2014 14:45:34 +0000 (14:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Apr 2014 14:45:34 +0000 (14:45 +0000)
* commit 'a52a37b0fe17109877abbc25943d0d74232f3e5f':
  Add lockout after trying to enter PIN / Password too often


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help