OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1...
authorXin Li <delphij@google.com>
Mon, 14 Nov 2016 13:30:19 +0000 (13:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 13:30:19 +0000 (13:30 +0000)
am: 5386c74a44

Change-Id: I122525c6a85e1542370835d88e83cad30f747bff


Trivial merge