OSDN Git Service

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

Change-Id: I5cf1015e071c8a98d63fc318088746c9728f3795


Trivial merge