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

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev 

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb907 am: fffbd1d3 am: db47d7e3 am: 6976e5f2 skipped: 575b8c81
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb907 am: fffbd1d3 am: db47d7e3 am: 6976e5f2
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb907 am: fffbd1d3 am: db47d7e3
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb907 am: fffbd1d3
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb907
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)
parents 48232415 5b7685e7
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