OSDN Git Service

Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc-dev
authorHansong Zhang <hsz@google.com>
Thu, 31 May 2018 18:46:51 +0000 (11:46 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 18:46:51 +0000 (11:46 -0700)
am: 68e7c87d93

Change-Id: I738a2678612fdd48af1c669736c04bb4875d9da5


Trivial merge