| commit | 4d6d722017d5fa77be02d60580f35d76189c3ed1 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Thu Jul 17 15:46:42 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 17 07:39:11 2014 +0000 |
| tree | 58d9182f4071a33141286e1fc905bfe32a222ec8 | |
| parent | 78fd9d6b36b78abb57bf2a29e314202bdf26f480 [diff] | |
| parent | 89f060a1e0fa48c497855d061b5c9ec44bb576c8 [diff] |
Merge "Zen: Return of the alarm warning." into lmp-dev