tree 0a101e3f71cd3216b8d6e1aa8f8e6e63a2608e55
parent 87adc3305ca17a761be7d0bba37a0d1aa126548a
author Colin Cross <ccross@android.com> 1505348159 -0700
committer Scott Pollom <spollom@google.com> 1505434158 -0700

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