OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d41530 5ccfe51)
am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware...
authorAndres Morales <anmorales@google.com>
Wed, 27 May 2015 20:24:08 +0000 (20:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 20:24:08 +0000 (20:24 +0000)
* commit '5ccfe51d8b9ae4f73a3b0fdb553b807cf5691582':
  [LockSettings] migrate password attempt throttling to hardware


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help