OSDN Git Service

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