tree 7fe265ea809eefb1c0670cb05dbb79fd82188755
parent becc7df8accf2b72ab4367bd8ffae5518a9f3cfb
parent c074592eac40f439c7b6b027a7d70332400e9e8c
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 mnc-dr-dev

* changes:
  [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