Merge "Introduce network link quality statistics" into klp-dev

author Vinit Deshapnde <vinitd@google.com>

Thu, 22 Aug 2013 16:16:44 +0000 (16:16 +0000)

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

Thu, 22 Aug 2013 16:16:45 +0000 (16:16 +0000)
author Vinit Deshapnde <vinitd@google.com>
Thu, 22 Aug 2013 16:16:44 +0000 (16:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 22 Aug 2013 16:16:45 +0000 (16:16 +0000)
diff --cc core/java/android/net/EthernetDataTracker.java
Simple merge
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc services/java/com/android/server/ConnectivityService.java
Simple merge
author	Vinit Deshapnde <vinitd@google.com>
	Thu, 22 Aug 2013 16:16:44 +0000 (16:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 22 Aug 2013 16:16:45 +0000 (16:16 +0000)
		1	2
core/java/android/net/EthernetDataTracker.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history