tree e8355fe90435f85a0fc68da5bc70c8ed8b8c212a
parent 2ba23e71bd055c137c5f2151b2425f5c25c1d794
parent 1afe196758b2895c83a0a622b57ea7450a5918ff
author Ugo Yu <ugoyu@google.com> 1549658459 -0800
committer android-build-merger <android-build-merger@google.com> 1549658459 -0800

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (2/2)" into oc-dev am: ed55dbca29 -s ours am: c025c672c6 -s ours
am: 1afe196758 -s ours
am skip reason: subject contains skip directive

Change-Id: Ica1d58f0fb31a21c80af8f5ee6ddc69c04431a47