tree b91aef0d45cf5852bfd5baff40a0c149d04c57ed
parent 5f809e3fff2b4c6c94d966ceb93e6cf74fe9813b
parent 2f096ed7662f9d20876ae2944ffc4ecf4fd51faa
author John Spurlock <jspurlock@google.com> 1430766449 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1430766456 +0000

Merge "Zen: Implement calendar event system condition provider." into mnc-dev