Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42f7ca68 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Move some NetworkStats tests to tests/net." am: ab3901dc am: 67401e25

am: 997e6b08

Change-Id: I37c1d362d891ec3b09b00df44aaf233adf355077
parents 1737e103 997e6b08
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.Suppress;
import android.test.suitebuilder.annotation.Suppress;
import android.util.Log;
import android.util.Log;


import com.android.frameworks.coretests.R;
import com.android.frameworks.tests.net.R;


import java.io.ByteArrayInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayOutputStream;
+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ import android.net.NetworkStats;
import android.net.TrafficStats;
import android.net.TrafficStats;
import android.test.AndroidTestCase;
import android.test.AndroidTestCase;


import com.android.frameworks.coretests.R;
import com.android.frameworks.tests.net.R;


import java.io.File;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileOutputStream;
Loading