diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-19 17:11:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-19 17:11:47 +0000 |
| commit | 2bc269265b604002af7a51b93f6b0c7326f14f9b (patch) | |
| tree | a0f1df37869986465eff9db5c6f976e0b78e04f2 /tests | |
| parent | c43ddadb047822399187407c519a683547924039 (diff) | |
| parent | 5d4eb1d5aba14294a418ec8c8804084cf4b0a17f (diff) | |
| download | android_packages_apps_Trebuchet-2bc269265b604002af7a51b93f6b0c7326f14f9b.tar.gz android_packages_apps_Trebuchet-2bc269265b604002af7a51b93f6b0c7326f14f9b.tar.bz2 android_packages_apps_Trebuchet-2bc269265b604002af7a51b93f6b0c7326f14f9b.zip | |
Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests" into ub-launcher3-master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 43030aec9..ec89f9c02 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -18,8 +18,8 @@ xmlns:tools="http://schemas.android.com/tools" package="com.android.launcher3.tests"> - <uses-sdk android:targetSdkVersion="25" android:minSdkVersion="21"/> - <uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/> + <uses-sdk android:targetSdkVersion="25" android:minSdkVersion="21" + tools:overrideLibrary="android.support.test.uiautomator.v18"/> <application android:debuggable="true"> <uses-library android:name="android.test.runner" /> |