Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev

author Erik Kline <ek@google.com>

Thu, 4 Dec 2014 03:13:54 +0000 (03:13 +0000)

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

Thu, 4 Dec 2014 03:14:02 +0000 (03:14 +0000)
author Erik Kline <ek@google.com>
Thu, 4 Dec 2014 03:13:54 +0000 (03:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 4 Dec 2014 03:14:02 +0000 (03:14 +0000)
diff --cc core/java/android/net/ConnectivityManager.java
Simple merge
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
author	Erik Kline <ek@google.com>
	Thu, 4 Dec 2014 03:13:54 +0000 (03:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 4 Dec 2014 03:14:02 +0000 (03:14 +0000)
		1	2
core/java/android/net/ConnectivityManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history