commit 693db5d70b29814d2795039bcecb5fbff0b731cb
author Colin Cross <ccross@android.com> Wed Sep 13 17:15:59 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Mon Sep 18 21:42:34 2017 +0000
tree ebd4aad8bb9366b7e7a48e86fc81b7540e0f617e
parent 291e4d2420c6879396f98c3c4a1cd82734b7315c

Use tools:node="replace" instead of tools:merge="override"

tools:merge="override" is no longer supported in Manifest Merger 2.

Bug: 36005379
Test: m -j Launcher3Go
Change-Id: I289f74f35876cdf274433ec1a579875217d9b9a8
(cherry picked from commit 318a8b626fff66708cee5ef6e3b4cc99eeb410eb)

go/AndroidManifest.xml

diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml
index ed8e0ad..fbaf981 100644
--- a/go/AndroidManifest.xml
+++ b/go/AndroidManifest.xml
@@ -42,7 +42,7 @@
             android:excludeFromRecents="true"
             android:autoRemoveFromRecents="true"
             android:label="@string/action_add_to_workspace"
-            tools:merge="override" >
+            tools:node="replace" >
             <intent-filter>
                 <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
             </intent-filter>