Fix the build
broken merge resolution.
Change-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 579051c..96a239d 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1637,7 +1637,6 @@
FeatureUser u = (FeatureUser)msg.obj;
u.expire();
break;
-<<<<<<< HEAD:services/java/com/android/server/ConnectivityService.java
case NetworkStateTracker.EVENT_CLEAR_NET_TRANSITION_WAKELOCK:
String causedBy = null;
synchronized (ConnectivityService.this) {
@@ -1651,7 +1650,7 @@
Slog.d(TAG, "NetTransition Wakelock for " +
causedBy + " released by timeout");
}
-=======
+ break;
case NetworkStateTracker.EVENT_INET_CONDITION_CHANGE:
if (DBG) {
Slog.d(TAG, "Inet connectivity change, net=" +
@@ -1715,7 +1714,6 @@
}
mDefaultInetConditionPublished = mDefaultInetCondition;
sendConnectedBroadcast(networkInfo);
->>>>>>> ec52c98d:services/java/com/android/server/ConnectivityService.java
break;
}
}