Merge "Data stall detection using DNS event"

author Chiachang Wang <chiachangwang@google.com>

Wed, 28 Nov 2018 03:53:30 +0000 (03:53 +0000)

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

Wed, 28 Nov 2018 03:53:30 +0000 (03:53 +0000)
author Chiachang Wang <chiachangwang@google.com>
Wed, 28 Nov 2018 03:53:30 +0000 (03:53 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 28 Nov 2018 03:53:30 +0000 (03:53 +0000)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
author	Chiachang Wang <chiachangwang@google.com>
	Wed, 28 Nov 2018 03:53:30 +0000 (03:53 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 28 Nov 2018 03:53:30 +0000 (03:53 +0000)
		1	2
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/tests/coretests/src/android/provider/SettingsBackupTest.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history