Merge "DO NOT MERGE - Added Emergency affordance feature"

am: a0322d5c5a  -s ours

Change-Id: I9de0c5ce3ab2fb3e5c44cc518a32da1432846bbc
This commit is contained in:
Selim Cinek
2016-10-10 21:23:27 +00:00
committed by android-build-merger

Diff Content Not Available