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:35:03 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:35:03 +0000 (20:35 +0000)
am: 781d8f7426

Change-Id: I2c144951b08fda465e0ee4ad4ba50f9ebe247a1c


Trivial merge