tree 0ba0f714cb29fee480df3762d015cbc62f9d1102
parent 68d354abce77acda2ae48b877816efc7d748deef
parent 781d8f74263ab00675d850d8c107ec66c44238a9
author Xin Li <delphij@google.com> 1478723703 +0000
committer android-build-merger <android-build-merger@google.com> 1478723703 +0000

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac
am: 781d8f7426

Change-Id: I2c144951b08fda465e0ee4ad4ba50f9ebe247a1c