OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1ab099 38e6e4e)
am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
authorAndres Morales <anmorales@google.com>
Wed, 16 Sep 2015 16:12:03 +0000 (16:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 16:12:03 +0000 (16:12 +0000)
* commit '38e6e4ef98ea1f116902725c282df9fb061a224e':
  reset lockout deadline on device reboot


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