tree 441f5a0662947ee96190116b91f239fda5f9c940
parent 8f3fdc24c70b3e64e7f865ae6f1fab957e3a036c
parent cbb732a8c449f59f88dadcacad006008b2a16207
author John Spurlock <jspurlock@google.com> 1412024603 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412024603 +0000

am cbb732a8: am 39838b98: Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev

* commit 'cbb732a8c449f59f88dadcacad006008b2a16207':
  Zen: Fix downtime calculation for Sunday mornings.