Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours

am: 16090c6177  -s ours

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

Diff Content Not Available