OSDN Git Service

Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
authorSelim Cinek <cinek@google.com>
Wed, 9 Nov 2016 23:19:25 +0000 (23:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 23:19:25 +0000 (23:19 +0000)
am: 6a6bc370e9

Change-Id: Iae4342afea01390f6b2567832f863881907dacb0


Trivial merge