OSDN Git Service

Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
authorSelim Cinek <cinek@google.com>
Thu, 13 Oct 2016 00:41:27 +0000 (00:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 00:41:27 +0000 (00:41 +0000)
commitf3eb11bdc176ee09437deade677983d3be1fc476
tree69eb52392633d6cc0045aa5fbb383af6ae7656a5
parentc46b2ef8d2007d2e12ca5361e39f5621acb48fc5
parent7ce68fd8a4278366c0f990777a117b9f1fa8442c
Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
am: 7ce68fd8a4

Change-Id: I775e64348075fe1dd57a7133fcdc7b11f79415d6