Commit 080e54bb 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-mr1-dev 

* changes:
  [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 e26c1420 81488162
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