OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result...
authorHansong Zhang <hsz@google.com>
Mon, 9 Apr 2018 22:07:33 +0000 (15:07 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 22:07:33 +0000 (15:07 -0700)
commit3e71e5c2c3dfa5d83159a09069d1ac854f545b08
tree8f836416bf286bf9c477b4fa2cfb2160275f4501
parent1a5e3d8a8fa5b610e03b9aed9448b34f56f20478
parentb906b83069191bdd7d863c5406a6629043ded7c5
[automerger skipped] Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev am: 781315d4af
am: b906b83069  -s ours

Change-Id: I19d04178e5de67bacf4e955eaf8c69bf007ebf80