OSDN Git Service

Merge changes from topic "am-5821813f-624a-468d-ae05-8b2918b15c74-nyc-dev" into nyc...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 31 May 2018 17:41:46 +0000 (17:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 31 May 2018 17:41:46 +0000 (17:41 +0000)
commit586ea21129814b832633df6cdd75729aa60beadf
tree012dec7da1d916bdb226c07bebe721a5766c441a
parente2efdf5c7cb525a6c54bf865e1a3d887421a74fd
parent9e5fea546772340a32c1c15104268195c02be255
Merge changes from topic "am-5821813f-624a-468d-ae05-8b2918b15c74-nyc-dev" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 078756d807
  DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event