More merge errors

Change-Id: Id46a26a29bcf119f25ab08ec002daa255824bc2f
Signed-off-by: Evan Anderson <evan1124@gmail.com>
4.3 services/connectivitymanager

Change-Id: I4777eddee04a6df37098c3e17c0eca210399038e
Merge remote-tracking branch 'pa/jb43' into jellybean

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: I8e6a212998b0fd137e112757f97b23b2340e9470