tree 81b94d15afa4ed0045559fff49d13ad32d6db6c1
parent 2cd4383c316b894bd10191f64c1394df1d2c1b0d
parent df1b6d2f58a7de3c7d9bfd612cf9aeeea1f25990
author Xin Li <delphij@google.com> 1476391879 -0700
committer Xin Li <delphij@google.com> 1476391902 -0700

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into
marshmallow-dev" into mnc-dev.

Change-Id: I7215eebd4a2cc9a4b6ccf2a3e36ed8edc556d208