commit 82c114ca9ca212e8257d34860b42f4a021a63213
author Tony Wickham <twickham@google.com> Thu Jul 19 21:55:36 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 19 21:55:36 2018 +0000
tree 0792dcbf1b195b3af31ce846451bb5b78918ab8d
parent b5a7d42c7f8c93c2d49c8ce7a0161e8d178a220e
parent 8bf6064fe0cb2e961e4e2d07232b9102fdad0f01

Merge changes from topic "am-688aa1b8-4ed3-4170-9276-c3248d214981" into ub-launcher3-master

* changes:
  [automerger] Add null check before playing recents scale down anim am: 7cc878b5ae
  Add null check before playing recents scale down anim

tests/AndroidManifest-common.xml

diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index af8b15c..89ca7f3 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -31,7 +31,6 @@
                        android:resource="@xml/appwidget_no_config" />
         </receiver>
 
-
         <receiver
             android:name="com.android.launcher3.testcomponent.AppWdigetHidden"
             android:label="Hidden widget">