OSDN Git Service

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

Change-Id: I43f556df4700c9470a0df500eadddcbcd8146cf7


Trivial merge