OSDN Git Service

Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220
authorHansong Zhang <hsz@google.com>
Fri, 12 Jan 2018 19:11:40 +0000 (19:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:11:40 +0000 (19:11 +0000)
commit0c8337c1e74b2d5d0bad7607249af69c4753d3ea
treeccf203074178e6d8985a897923a1ae904726569c
parent484a8ff430d38d4b48b3d4df6970bcfbdd6aec50
parent88312931fdd2b8555ec3b538ee3e497da8b6b7d9
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220
am: 88312931fd

Change-Id: Ie2eaf68551b3d36eefeb0c802317da5ecf430df5