tree bbb35fa05a71813d64980ad6d8faf2e33fea636a
parent d84061096d119204fd1b522a6edf5853818f6764
parent 99686f56296d73aae80acaf6ae8bf951aef88872
author TreeHugger Robot <treehugger-gerrit@google.com> 1557427788 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1557427788 +0000

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-mr1-dev

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: f4ba1c4490 am: 52d26b0ef4
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: f4ba1c4490
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"