Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev am: 6a6bc370e9
am: aaa70f5d37
Change-Id: Ia3f4705c1a84f87629842fe13c9064b41ae4975c
This commit is contained in:
6a6bc370e9
am: aaa70f5d37
Change-Id: Ia3f4705c1a84f87629842fe13c9064b41ae4975c