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:38:06 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:38:06 +0000 (19:38 +0000)
commit363943dd6217e72fbf4d3a2aea582ca591a0e764
tree80b5e841eb8069cc736ca6c4c66102c8d68159aa
parentc13a7d179cca3bdeab6638ac19d317936f36df44
parent64baebf6275ccee85dc5250b0518cdb3b493f821
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220 am: 88312931fd am: 0c8337c1e7 am: 0ebb1d7ac5 am: f89d1d78f9  -s ours am: ec7e954952  -s ours
am: 64baebf627  -s ours

Change-Id: Ifef382b53936d6db5dd340f7c7fac1433dbf1b6f