OSDN Git Service

Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc...
authorHansong Zhang <hsz@google.com>
Thu, 31 May 2018 19:59:07 +0000 (12:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 19:59:07 +0000 (12:59 -0700)
am: 872abf0d70

Change-Id: Iab4c923a555c653154921c4fbb3f3cc33a5b4794


Trivial merge