tree 81c10138833fe27f74c7da8b11b676a626a28c6a
parent daeeda35d951e9b6925a98cd0d909a59a94bd59f
parent bf8694c933ec720d5faa362b5f97c173f6e9f823
author Selim Cinek <cinek@google.com> 1476320503 +0000
committer android-build-merger <android-build-merger@google.com> 1476320503 +0000

Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev am: 7ce68fd8a4 am: f3eb11bdc1
am: bf8694c933

Change-Id: Ib3c604789d274c3a3dd5f97bcaba501730feda66