OSDN Git Service

Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am...
authorSelim Cinek <cinek@google.com>
Fri, 14 Oct 2016 14:29:03 +0000 (14:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 14:29:03 +0000 (14:29 +0000)
am: e58f1e5965

Change-Id: I483d2f52d347d2fb0064a6f9a0e6db3d5a61aa67


Trivial merge