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

Change-Id: Icd07d2224a1b58800f7344ff3b7928b335904446


Trivial merge