OSDN Git Service

am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline...
authorBill Rassieur <rassb@google.com>
Mon, 28 Sep 2015 23:19:32 +0000 (23:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Sep 2015 23:19:32 +0000 (23:19 +0000)
commit6e78bb42fc8af64f4f2208b48585451793e303c9
tree27538a6101c75339440c743ff698bddea7539dc9
parentcd72b8be4653841f34a8d757cf27b055f40105bd
parent2711eb4c3950ee0b5776c07957f0af3c31aa1c67
am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev

* commit '2711eb4c3950ee0b5776c07957f0af3c31aa1c67':
  Fix jank: Don't write lockout deadline if not needed