Merge "Fix FlakyTest import" into sc-v2-dev

This commit is contained in:
TreeHugger Robot
2021-09-24 03:14:49 +00:00
committed by Android (Google) Code Review

View File

@@ -34,10 +34,10 @@ import android.hardware.devicestate.IDeviceStateManagerCallback;
import android.os.Binder; import android.os.Binder;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.platform.test.annotations.FlakyTest;
import android.platform.test.annotations.Presubmit; import android.platform.test.annotations.Presubmit;
import androidx.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import androidx.test.filters.FlakyTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.server.wm.ActivityTaskManagerInternal; import com.android.server.wm.ActivityTaskManagerInternal;