tree f8ec9ddfdbc379f68a2136f141ad11dad4c0a06f
parent 970a11a07703b4bd78c038ca480d4482715dae2a
parent add688f6b3ff8adfcfd5cea379eccbeb9b22b953
author Ugo Yu <ugoyu@google.com> 1559677480 -0700
committer android-build-merger <android-build-merger@google.com> 1559677480 -0700

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am: add688f6b3 -s ours
am skip reason: subject contains skip directive

Change-Id: I09c517978113a8837c1cbccab61fa75eb7f199fd