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 20:04:14 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 20:04:14 +0000 (20:04 +0000)
am: a7fe356eeb  -s ours

Change-Id: I902f7c12a32da6a332e4435e09a774c9ed17cce6


Trivial merge