Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show"

am: 6f3a05ae77  -s ours

Change-Id: I6c171749daead32d9a5e88aefa0a2a50cd767253
This commit is contained in:
Selim Cinek
2016-10-13 01:01:10 +00:00
committed by android-build-merger

Diff Content Not Available