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)
commit45249aaacac06d0f45aa4d80fdb8e08f39ba2f2b
tree28192c26feec7bb39c530262c9fca0a66d321251
parent7c0d1d7016492b6edb818fbcaf11a552223a6f3f
parent872abf0d705fed056b1b24265471309d18973347
Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc-dev am: 68e7c87d93
am: 872abf0d70

Change-Id: Iab4c923a555c653154921c4fbb3f3cc33a5b4794