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

Change-Id: I062b547da4a7190f27de0979b9859d4ce4307b00


Trivial merge