OSDN Git Service

Merge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into nyc-mr2-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)
* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6 am: de43e591ab
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result


Trivial merge