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)
am: b7f279051e

Change-Id: I0de48588205d46a800b4a945f364fab8e44e3f48


Trivial merge