tree 6327de30b762832c07fd09329737b21d807d8488
parent 7d2daa4f39bb66cf5a880536d013ba4d146ac5ff
parent bf475341efaa4fd0422e5ef465b11c51777154e2
author TreeHugger Robot <treehugger-gerrit@google.com> 1523306516 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1523306516 +0000

Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98bff am: c074592eac am: 6479e3651f skipped: 3108a62ad9
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98bff am: c074592eac am: 6479e3651f
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98bff am: c074592eac
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98bff
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result