OSDN Git Service

Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev
authorHansong Zhang <hsz@google.com>
Mon, 9 Apr 2018 22:02:05 +0000 (15:02 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 22:02:05 +0000 (15:02 -0700)
am: 781315d4af

Change-Id: I08035c8474020faf9b8a4d31f0af06adf9be9297

1  2 
bta/dm/bta_dm_act.cc

Simple merge