OSDN Git Service

Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am...
authorSelim Cinek <cinek@google.com>
Thu, 13 Oct 2016 14:29:21 +0000 (14:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 14:29:21 +0000 (14:29 +0000)
am: 20307881d7  -s ours

Change-Id: I14e0635d7ed1d7caf14f9217d5d0bf88685a738f


Trivial merge