commit 2580bd67833a94f71d603631af288da681f71671
author Jon Miranda <jonmiranda@google.com> Thu Oct 12 00:04:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 00:04:58 2017 +0000
tree bf5158c45d848cb1429afe0936122d5ced9bcee4
parent 1df303950e030bf15705fdb3cc391a629d6c84be
parent ea6d0e631e0f8c607545c378dbd00142ca6a3b15

Merge branch 'ub-launcher3-dorval-polish2'
am: ea6d0e631e

Change-Id: Iad151c917d51a5d90f7f3baddc76974fc44ee4ff

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>