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

2017-09-18 21:03:59 +00:00

..

res

Import translations. DO NOT MERGE

2017-08-09 04:24:16 -07: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:03:59 +00:00