Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours am: 00c553e1ba -s ours

am: 8f681f7220

Change-Id: Ic3fe3a5021097097a3b818040e046de1e9011941
This commit is contained in:
Selim Cinek
2016-10-14 14:17:58 +00:00
committed by android-build-merger

Diff Content Not Available