commit f7438cc74c744e9b799871dda72590df75cfcfa8
author android-build-team Robot <android-build-team-robot@google.com> Tue Sep 19 08:10:48 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Sep 19 08:10:48 2017 +0000
tree 0a101e3f71cd3216b8d6e1aa8f8e6e63a2608e55
parent e557844787b09ec0b8a7165da7bfc8e2fa1b0a28
parent 0a0c949a6fa0c4b142bd6b3270b8e09ac04c1cd1

release-request-849a3dc3-db53-4e70-9b7a-92295133ddeb-for-git_pi-release-4346747 snap-temp-L27900000104043986

Change-Id: Icd948fcec2a6974114517ab491c1b48760ff8c00

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>