OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1...
authorXin Li <delphij@google.com>
Fri, 11 Nov 2016 00:00:49 +0000 (00:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 00:00:49 +0000 (00:00 +0000)
am: 9788dd5bd2

Change-Id: I317b0be7182896e39fd23b152ff08ebf4de37592


Trivial merge