commit 7bf2334945fd383379720a594b164b170eba2dee
author Lorenzo Colitti <lorenzo@google.com> Thu Mar 12 07:49:23 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 12 07:49:23 2015 +0000
tree d7dd2ed918ac50ee89742260a49d3831141077d1
parent 4c12c31336abfceaab1a00da760848bf0ab4c6a1
parent abd0acd039eccfcc2922aa5a49595b9177168797

Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 478b48b..d9ef766 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -62,7 +62,6 @@
 import android.net.Proxy;
 import android.net.ProxyInfo;
 import android.net.RouteInfo;
-import android.net.SamplingDataTracker;
 import android.net.UidRange;
 import android.net.Uri;
 import android.os.Binder;