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:32:18 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:32:18 +0000 (19:32 +0000)
commit64baebf6275ccee85dc5250b0518cdb3b493f821
treed28f67c0a23b5dbf9242fa5a91b9b260ff3888fe
parentdada4eefbc9a6edee104bbf669ac6d56c7327f83
parentec7e95495280d1d78386d0de4b3dbbd62f4c4b15
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

Change-Id: Id7bc496124c20d38cc54fd3c3c5437dd2b02fdd9