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

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

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f807 am: ea5e8148 am: 81488162 am: 2f19a132
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f807 am: ea5e8148 am: 81488162
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f807 am: ea5e8148
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f807
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
parents d691b2dd a328e6dc
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment