| commit | 4679b5553e1eaa1e7d4d20b1c5ec6ea8206789e6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 20:56:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:56:41 2016 +0000 |
| tree | f607dcc26a14e2b9d4fb2f40b78b8a31471ac693 | |
| parent | 6d6c885f9a9d12633182364cd2a76494d6fb0e9e [diff] | |
| parent | 3b4f8bc03408f0425d48e3c31c2139b78ac2eed6 [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 am: 3b4f8bc034 Change-Id: Ie39a05ce72f9d65ae6c5a76a6954a27966b7f667