| commit | 8f72b4037022c4f860caafa296e2ac309bde177f | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Thu Apr 30 15:45:53 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 30 15:45:55 2015 +0000 |
| tree | 70623eabd54a22cde23cc00ea3a21851e8b764f2 | |
| parent | 1b12db9e6225171da87ed9586daeabf76b53c05a [diff] | |
| parent | d60258f2d33214077a22c1a682944fa9e47c0461 [diff] |
Merge "Zen: New event condition data model." into mnc-dev