Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev

am: 7ce68fd8a4

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

Diff Content Not Available