commit 1df303950e030bf15705fdb3cc391a629d6c84be
author Jon Miranda <jonmiranda@google.com> Wed Oct 04 16:45:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 04 16:45:44 2017 +0000
tree 39b32a430123e8bff7bb28988fea8dd53b696ee1
parent a420855e0bdc83d07c0e172c3fa7f5f93a43acb0
parent a328a0d83a1149b884dd49d302414d8080d28e40

Merge branch 'ub-launcher3-dorval-polish2' into 1003
am: a328a0d83a

Change-Id: Ia2e6a6cf4c84fbb0ecae615c7e91b43e3d0bf50e

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>