tree c931f04b960a244d00f6e9fb025d492637761eac
parent 9eb2092ea146faa21b8c6e0e512c03fc67a09dda
parent 530052a2fe3b6a6a4246ce28ab0ced647fe7f470
author John Spurlock <jspurlock@google.com> 1418057246 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418057248 +0000

Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev