OSDN Git Service

am ad2399f3: Merge "Zen: Implement calendar event system condition provider." into...
authorJohn Spurlock <jspurlock@google.com>
Tue, 5 May 2015 00:56:53 +0000 (00:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 May 2015 00:56:53 +0000 (00:56 +0000)
* commit 'ad2399f3be4861d0f5acf072460d98fafc951c57':
  Zen: Implement calendar event system condition provider.


Trivial merge