commit 40f806ef53c0b29406062605e7dadda42d8027b7
author Jon Miranda <jonmiranda@google.com> Tue Sep 19 23:39:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 19 23:39:27 2017 +0000
tree c4e82ff572718bae87da4440976990f3af2b89d8
parent c510d042fb28fd48cf7f2bcdf95b16d41f9f5ebf
parent fb46415e803a7f20a7d48bf42106f3f40cd769dd

Merge "Merge branch 'ub-launcher3-dorval-polish2'" into oc-mr1-dev
am: fb46415e80

Change-Id: I78c3b855c5c213c3ba89288f6d0f8a1a61c263d3

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>