OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:51:08 +0000 (20:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:51:08 +0000 (20:51 +0000)
am: 892385f520

Change-Id: Icd01d06e42adc1995f555cc6e6bc146baee0fce1


Trivial merge