tree ebd4aad8bb9366b7e7a48e86fc81b7540e0f617e
parent 291e4d2420c6879396f98c3c4a1cd82734b7315c
author Colin Cross <ccross@android.com> 1505348159 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1505770954 +0000

Use tools:node="replace" instead of tools:merge="override"

tools:merge="override" is no longer supported in Manifest Merger 2.

Bug: 36005379
Test: m -j Launcher3Go
Change-Id: I289f74f35876cdf274433ec1a579875217d9b9a8
(cherry picked from commit 318a8b626fff66708cee5ef6e3b4cc99eeb410eb)