Merge "Force creation of Socket upon Transform application" into pi-dev

author Benedict Wong <benedictwong@google.com>

Mon, 9 Apr 2018 20:55:30 +0000 (20:55 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 9 Apr 2018 20:55:30 +0000 (20:55 +0000)
author Benedict Wong <benedictwong@google.com>
Mon, 9 Apr 2018 20:55:30 +0000 (20:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 9 Apr 2018 20:55:30 +0000 (20:55 +0000)
diff --cc core/java/android/net/IpSecManager.java
Simple merge
diff --cc tests/net/java/android/net/IpSecManagerTest.java
Simple merge
author	Benedict Wong <benedictwong@google.com>
	Mon, 9 Apr 2018 20:55:30 +0000 (20:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 9 Apr 2018 20:55:30 +0000 (20:55 +0000)
		1	2
core/java/android/net/IpSecManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/net/java/android/net/IpSecManagerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history