OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:11:44 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:11:44 +0000 (20:11 +0000)
am: 78f15948fb

Change-Id: I5f5509cd98a6a98ce9edc782e9d8ef9093fa86e4


Trivial merge