| commit | c38d15590129d9a06bb6b7542a4f74b4b7dd6058 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Oct 10 20:42:14 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 10 20:42:15 2016 +0000 |
| tree | 263e73130f616bb3e371b16f5d0ae663684e0bdb | |
| parent | 258b56ec58fca2b740bcfe9a2af81f0f59a14abb [diff] | |
| parent | cd22634003056f8d7f0c10ac7b8a30e11a981110 [diff] |
Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev