tree 0a101e3f71cd3216b8d6e1aa8f8e6e63a2608e55
parent 387a44670b9be4052ce0cc889d60b46979182fd0
author Colin Cross <ccross@android.com> 1505348159 -0700
committer Colin Cross <ccross@android.com> 1505768639 +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
Merged-In: I289f74f35876cdf274433ec1a579875217d9b9a8
(cherry picked from commit 318a8b626fff66708cee5ef6e3b4cc99eeb410eb)