tree 87171d8806a4eaae52060c4c1014f22d9d9a725e
parent 73576b22bc56e047b2b6afecc74213589b33bc07
parent 97a7360660dc6473286a12d72eecff277e6182e1
author Joe LaPenna <jlapenna@google.com> 1428096549 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428096549 +0000

am 97a73606: am e59f4260: am 1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev

* commit '97a7360660dc6473286a12d72eecff277e6182e1':
  Make burn in protection updates happen on the minute.