OSDN Git Service

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


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