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:57:56 +0000 (20:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:57:56 +0000 (20:57 +0000)
commitd05a06d1e248d1eb90a391f6517aae806ab6c51b
treef607dcc26a14e2b9d4fb2f40b78b8a31471ac693
parent4679b5553e1eaa1e7d4d20b1c5ec6ea8206789e6
parentb7f279051e891ed7b158247d9d7091786be381ce
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
am: b7f279051e

Change-Id: I0de48588205d46a800b4a945f364fab8e44e3f48