OSDN Git Service

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

Change-Id: Ia972df65c6ad3da624c16cbe911474560286ac3d


Trivial merge