tree 48a18b921bd27794b83c2f69e21ca68270027f88
parent 1f26fadba73bf428d7a6662810f2a87ce3d6da45
parent fbf2e0fb2c1f46d97dcaca78fb63b244bb53e9d3
author Selim Cinek <cinek@google.com> 1486685568 +0000
committer android-build-merger <android-build-merger@google.com> 1486685568 +0000

Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
am: fbf2e0fb2c

Change-Id: Ib1c45af5ffea1d09e14ac5daac61a1046d2594a2