| commit | a0ceb908bfe6d030f588455db3f3b42c9931fdea | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Tue Apr 29 00:09:52 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 29 00:09:53 2014 +0000 |
| tree | bec917c1172e2997bac665f247933c77cf7f6b93 | |
| parent | 3dc6bec751c0dee3b71fb6b6b32a42636d8ac3d3 [diff] | |
| parent | 623a0e9f45c294ea7e714295f41ba2d8bcd7b32e [diff] |
Merge "Add zen-mode exit condition dialog to settings."