Xin Li 7e0483fcec Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into ...

lollipop-mr1-dev" into lmp-mr1-dev.

Change-Id: Ia47211f647d0d49b0adf3cb65eba4b9b686bcbff

2016-10-13 13:54:54 -07:00

..

android

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into

2016-10-13 13:54:54 -07:00

google/android

…