Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev.

am: 7e0483fcec  -s ours

Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5
This commit is contained in:
Xin Li
2016-11-09 20:11:40 +00:00
committed by android-build-merger

Diff Content Not Available