PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update for 1.0.0-beta1" into pi-dev am: 3618f68c01

Browse Source 
am: f5bbe75951

Change-Id: Ie4c6ed581637cee25b2339474d68f9362be3659a
This commit is contained in:
Alan Viverette
2018-03-15 14:08:11 +00:00
committed by android-build-merger
parent 8c77f8e33e f5bbe75951
commit b15d01f415
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
View File

@@ -39,7 +39,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import androidx.app.slice.Slice;
import androidx.slice.Slice;
import java.util.HashMap;

2
tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
View File

@@ -35,7 +35,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import androidx.app.slice.Slice;
import androidx.slice.Slice;
@RunWith(SettingsRobolectricTestRunner.class)
public class SliceBuilderUtilsTest {