Colin Cross 693db5d70b 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 318a8b626f)

2017-09-18 21:42:34 +00:00

..

res

[automerger] Show progress dialog when uninstalling an app in Launcher3Go. am: c56e3ff2ee

2017-08-23 19:14:04 +00:00

src_flags/com/android/launcher3/config

Disable adaptive icon drawable parallax effect during drag and drop

2017-08-07 01:38:03 -07:00

AndroidManifest.xml

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

2017-09-18 21:42:34 +00:00