OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:34:01 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:34:01 +0000 (20:34 +0000)
am: 9dccfbc7c8

Change-Id: Ib02f82fa385a514d339331fc3f3b5309a8042fa5


Trivial merge