OSDN Git Service

Merge changes from topic "am-5821813f-624a-468d-ae05-8b2918b15c74-nyc-dev" into oc-dev
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)
commite0863fe41e920554d3459419ab95377d895bb544
tree3067524713dff1ea24f8cb188ac9d067311ae0c7
parent5767c158dc966ac3d0f13c4a205bdc3e34de575b
parent124e2d2c7de057f2719687f2aa2a3471083beec9
Merge changes from topic "am-5821813f-624a-468d-ae05-8b2918b15c74-nyc-dev" into oc-dev

* changes:
  [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 078756d807 am: 9e5fea5467 am: e8db90132d am: f66eddbcb4 skipped: 266edcd1c9
  [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 078756d807 am: 9e5fea5467 am: e8db90132d am: f66eddbcb4
  [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 078756d807 am: 9e5fea5467 am: e8db90132d
  [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 078756d807 am: 9e5fea5467
  [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