commit eb3e99bd11acafa5c73bfc69fdd5fb8b13870acd
author Jon <jonmiranda@google.com> Mon Jul 16 17:04:47 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 16 17:04:47 2018 -0700
tree 7a2e8f6ac92877b4bc577c3c5362dd0c60778173
parent 58ae9cbca6d164983de765074a4aa678eaa770d2
parent 0fd1472b940efc7f92c5a441935206afc9db7470

Merge branch 'ub-launcher3-edmonton-polish' into pi-dev
am: 0fd1472b94

Change-Id: Ib3e4a8a65875a76ba0f772619f44130f94dc4dad

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 43030ae..ec89f9c 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" />