Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f18bf40 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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: 54cfee17 am: 4379991b am: 7941a307 am: 035dd185 skipped: df714798
  [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 54cfee17 am: 4379991b am: 7941a307 am: 035dd185
  [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 54cfee17 am: 4379991b am: 7941a307
  [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 54cfee17 am: 4379991b
  [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: 54cfee17
  DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event
parents bdca3a51 4c68295b

There are no changes