tree a7c6aeaf5f96727d6191a359da2673eca7472875
parent 63c8b5bc58c004b70bae2f50ff0c972673056fed
parent 9d3abdd74231a645107740f831b72797605584e1
author John Spurlock <jspurlock@google.com> 1415308135 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415308135 +0000

am 9d3abdd7: am df2fe430: am d69dacb0: Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev

* commit '9d3abdd74231a645107740f831b72797605584e1':
  Zen: Track next-alarm condition across reboots.