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 20:47:31 +0000 (13:47 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 20:47:31 +0000 (13:47 -0700)
commit04d69628c3d7c85e825b2d63c37ce3f3abbf26d0
treecb0c5608e227f8e5e4411b4f6f19179b3a1e3195
parent77d44acf8068dda1ac8f233e08354a2763c35a1f
parent37726e1a42ad5db13fdceea0a3734ad689d346f7
[automerger skipped] Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-mr1-dev
am: 37726e1a42  -s ours

Change-Id: Iede70b74083a4f25ff9d0847c8164035d327ecea