OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machin...
authorHansong Zhang <hsz@google.com>
Thu, 31 May 2018 22:41:29 +0000 (15:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 22:41:29 +0000 (15:41 -0700)
commit9c322546440a3697518c0f2cf8b8e2f59a04d6ce
treefdae4c20f239624f9c2118c73148765ba5a0a44e
parent157799bc06d00ca4b3025980c96f7b6856578aa7
parent45249aaacac06d0f45aa4d80fdb8e08f39ba2f2b
[automerger skipped] Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc-dev am: 68e7c87d93 am: 872abf0d70
am: 45249aaaca  -s ours

Change-Id: I851839e32c1edfbaf58af84fc7f9f8ab35e7eeb4