OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:46:08 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:46:08 +0000 (20:46 +0000)
commitb7f279051e891ed7b158247d9d7091786be381ce
tree09de8ee4157a68f8c9a871824199a38604bd370c
parent3b4f8bc03408f0425d48e3c31c2139b78ac2eed6
parentc8ac64aca7e7c12f9d3c5d9cbffeede570601e1d
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
am: c8ac64aca7

Change-Id: I8116a4a96c47bad2ff769fba878b863cc517c016