Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am: fb36d44462

author Junyu Lai <junyulai@google.com>

Tue, 23 Apr 2019 08:18:54 +0000 (01:18 -0700)

committer android-build-merger <android-build-merger@google.com>

Tue, 23 Apr 2019 08:18:54 +0000 (01:18 -0700)
author Junyu Lai <junyulai@google.com>
Tue, 23 Apr 2019 08:18:54 +0000 (01:18 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 23 Apr 2019 08:18:54 +0000 (01:18 -0700)
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
diff --cc tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge
author	Junyu Lai <junyulai@google.com>
	Tue, 23 Apr 2019 08:18:54 +0000 (01:18 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 23 Apr 2019 08:18:54 +0000 (01:18 -0700)
		1	2
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/net/java/com/android/server/ConnectivityServiceTest.java	patch \|	diff1 \|	diff2 \|	blob \| history