diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-12 23:49:15 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-13 00:04:10 -0700 |
| commit | db64454b3354e26c96fdb83a4443cce12e352640 (patch) | |
| tree | f0138835e5ddd3595c732e09dd8145bd19eb1e1e /services/tests | |
| parent | 28070f43a64069a95f7cb2e5c463bdee41e58294 (diff) | |
| parent | b6b9fe216d4dab6249e77870a02589e58d6bc59f (diff) | |
| download | frameworks_base-db64454b3354e26c96fdb83a4443cce12e352640.zip frameworks_base-db64454b3354e26c96fdb83a4443cce12e352640.tar.gz frameworks_base-db64454b3354e26c96fdb83a4443cce12e352640.tar.bz2 | |
resolved conflicts for merge of b6b9fe21 to master
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java index beb353a..c198900 100644 --- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java @@ -20,7 +20,6 @@ import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE; import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.getNetworkTypeName; -import static android.net.NetworkStateTracker.EVENT_STATE_CHANGED; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; |