tree 94f6e1e6740384c57e3013c70f0baa669e810f98
parent 9905ef85187d2168ccebeba031838846aa75d23a
parent 59c10d21d4edfeb8df0892fcdfd83ad40bc9472f
author Benedict Wong <benedictwong@google.com> 1508863424 +0000
committer android-build-merger <android-build-merger@google.com> 1508863424 +0000

Merge "Add UDP encap socket test to CTS tests" am: 9b85584096
am: 59c10d21d4

Change-Id: I4bb69fe63bdcba3c92f27f0542c282b505f64dcf