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)
am: 7ce68fd8a4

Change-Id: I775e64348075fe1dd57a7133fcdc7b11f79415d6


Trivial merge