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:24:23 +0000 (20:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)
commit781d8f74263ab00675d850d8c107ec66c44238a9
tree3d30bdc6f6a832bec3e39268d75f6921cedebae9
parent9dccfbc7c84ec2575a5375d7c8ac6992096e20ba
parent1a06ebfcac288e8d308e3162575398e57eff17e6
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630
am: 1a06ebfcac

Change-Id: I062b547da4a7190f27de0979b9859d4ce4307b00