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)
commit5253946004a71c76a3bc21398123af06287bb21b
tree102859cf5244d5ce10e61c4ed575f50559219b7d
parent0024a4e2fffe06255598e4eb6bf7afc34aa95ef3
parenta7fe356eeb54323729e61682209aafaa4875a157
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 am: 363943dd62  -s ours
am: a7fe356eeb  -s ours

Change-Id: I902f7c12a32da6a332e4435e09a774c9ed17cce6