OSDN Git Service

DO NOT MERGE Fix unexpected behavior in SDP am: ed45f06fbd am: 40f7822e27
authorHansong Zhang <hsz@google.com>
Fri, 12 Jan 2018 19:17:14 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:17:14 +0000 (19:17 +0000)
am: 98916aaef5

Change-Id: I40da0b8f6c127487fe5680cb8cec937b3725b083


Trivial merge