OSDN Git Service

Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev
authorTreehugger Robot <treehugger-gerrit@google.com>
Mon, 10 Oct 2016 20:42:43 +0000 (20:42 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 10 Oct 2016 20:42:43 +0000 (20:42 +0000)

Trivial merge