diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-03-12 07:49:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-12 07:49:23 +0000 |
| commit | 1c24b3f110e0521a3840c3dfce9a86343fa02672 (patch) | |
| tree | 543d35d405abe2696c8addb97afab28c17d6bf71 | |
| parent | 2f196e6c81e50b70d56c1cc06fd2aec147b58ed8 (diff) | |
| parent | 7b5be4c0c741e44a8592ece40902eb0071f6d138 (diff) | |
| download | frameworks_base-1c24b3f110e0521a3840c3dfce9a86343fa02672.zip frameworks_base-1c24b3f110e0521a3840c3dfce9a86343fa02672.tar.gz frameworks_base-1c24b3f110e0521a3840c3dfce9a86343fa02672.tar.bz2 | |
Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 1 |
1 files changed, 0 insertions, 1 deletions
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.NetworkUtils; 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; |