resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp

author Hugo Benichi <hugobenichi@google.com>

Tue, 26 Jul 2016 15:18:51 +0000 (15:18 +0000)

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

Tue, 26 Jul 2016 15:18:51 +0000 (15:18 +0000)
author Hugo Benichi <hugobenichi@google.com>
Tue, 26 Jul 2016 15:18:51 +0000 (15:18 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 26 Jul 2016 15:18:51 +0000 (15:18 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
author	Hugo Benichi <hugobenichi@google.com>
	Tue, 26 Jul 2016 15:18:51 +0000 (15:18 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 26 Jul 2016 15:18:51 +0000 (15:18 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history