OSDN Git Service

Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220 am...
authorHansong Zhang <hsz@google.com>
Fri, 12 Jan 2018 19:48:56 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:48:56 +0000 (19:48 +0000)
am: 363943dd62  -s ours

Change-Id: I58bcb1cc639fe0f980359f8ec286b341e9b1ba2e


Trivial merge