tree 557f5784cc58da46412ca9348caa19f84cd78400
parent 9eec60bf8de3ae762ebe20a73890759b1f2eb36c
parent 40c8320b5f77587902c634ac09e6607d0a7acad9
author Victor Chang <vichang@google.com> 1504687288 +0000
committer android-build-merger <android-build-merger@google.com> 1504687288 +0000

Merge "Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" into nougat-cts-dev am: c2fc4acfdf" into nougat-mr1-cts-dev
am: 40c8320b5f

Change-Id: I8f8f556d1e36b58b19f34ec1c095192ea6bd95ab