commit a420855e0bdc83d07c0e172c3fa7f5f93a43acb0
author Jon Miranda <jonmiranda@google.com> Sat Sep 30 02:40:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 30 02:40:17 2017 +0000
tree 2d5855b2a76da80247aa711a4329721b623c034a
parent 40f806ef53c0b29406062605e7dadda42d8027b7
parent 850a7b1030ae172327d5ded01eb4c477d209e82b

Merge branch 'ub-launcher3-dorval-polish2'
am: 850a7b1030

Change-Id: Iefff638054d7916b8f87e8e9451677a8c650b43e

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>