tree 5f490723d81238b2fab9029c9e356aca912f6745
parent c60c304254fa125cf4a5a0e996db4cc0d3bd5c0c
parent b9eddbf8b74cf5ee389d91786b2559351146d721
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1557516200 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1557516200 +0000

Merge changes from topic "am-850e8d8f178c4deab0c5779bfd339edb" into qt-dev

* changes:
  [automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am: 50e6566d98 am: 280465888c -s ours am: c4d132a604 -s ours am: 9c5d78b382 -s ours am skip reason: subject contains skip directive
  [automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: 0fb39a1188 am: 3ad36be23b -s ours am: f57a65ed3b -s ours am: 47de95fe59 -s ours am skip reason: subject contains skip directive