OSDN Git Service

Merge "Fix unexpected behavior in SDP" into oc-dev am: 02ee3ed2df am: dada4eefbc...
authorHansong Zhang <hsz@google.com>
Fri, 12 Jan 2018 19:22:17 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:22:17 +0000 (19:22 +0000)
am: 201034078a

Change-Id: Ie414b1188e2d7ac9b4dbaaf0197cc6e28a4926d3


Trivial merge