| commit | 9b9906e9c017d84e722d9419d1025272db4bb582 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Oct 13 13:39:53 2016 -0700 |
| committer | Xin Li <delphij@google.com> | Thu Oct 13 13:40:33 2016 -0700 |
| tree | 092c176c552ce1b3ba9fadf31afdb4a7ccc89699 | |
| parent | 137c545e4e153200424f1d6cb368394827cdc6a2 [diff] | |
| parent | 15592d4a8e8317d88a3bf9301ce4939351e4766e [diff] |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. Change-Id: Iffde36524f2335b90d4887dcdd189eaf55dc60e6