| commit | 37486e54d7448bcf218f14102bc11662268c2f7d | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Mon Sep 22 21:15:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 22 21:15:32 2014 +0000 |
| tree | b20aeffbcb9a910b5148b612665986787ff884a4 | |
| parent | ce1145ddfb01664ed276728b823f9610ee89c443 [diff] | |
| parent | e35c9bf9ba0cb4438dfd001055fc6cd5c2d0a575 [diff] |
am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev * commit 'c018af27d9da4ee3d7dc79103ff35eb54f80a8de': Zen: Add events as a new config attribute.