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)
am: b906b83069  -s ours

Change-Id: I19d04178e5de67bacf4e955eaf8c69bf007ebf80


Trivial merge