| commit | 3b4f8bc03408f0425d48e3c31c2139b78ac2eed6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 20:45:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:45:14 2016 +0000 |
| tree | 09de8ee4157a68f8c9a871824199a38604bd370c | |
| parent | bcbd1f8110442edd2fbdb2cc0ca0bb971ca6a62f [diff] | |
| parent | 68d354abce77acda2ae48b877816efc7d748deef [diff] |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 am: 9dccfbc7c8 am: 68d354abce Change-Id: I1c8d54f67f0e644e90856197a0713f7d6f86b33f