tree 0a101e3f71cd3216b8d6e1aa8f8e6e63a2608e55
parent 318a8b626fff66708cee5ef6e3b4cc99eeb410eb
parent c510d042fb28fd48cf7f2bcdf95b16d41f9f5ebf
author Colin Cross <ccross@android.com> 1505769077 +0000
committer android-build-merger <android-build-merger@google.com> 1505769077 +0000

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

Change-Id: I60be51efa8561773100ecaf7fceb834443288537