OSDN Git Service

Merge "Fix formatting issue on Headset State Machine" am: 61345026a7 am: d9251e30cd
authorJack He <siyuanh@google.com>
Fri, 17 Mar 2017 23:09:17 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Mar 2017 23:09:17 +0000 (23:09 +0000)
am: b9e15bbb64  -s ours

Change-Id: I450faebab66e915677a672b1b6b0b3541dd0167b


Trivial merge