Merge "Fix SocketKeepalive APIs which do not meet API review requirement"

author Junyu Lai <junyulai@google.com>

Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)
author Junyu Lai <junyulai@google.com>
Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/net/ConnectivityManager.java
Simple merge
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
author	Junyu Lai <junyulai@google.com>
	Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/net/ConnectivityManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history