tree 03ef643d8c8681f25f439280091966eef5dede3f
parent c376617cb53510f4943e1a39f0dfd073c1f23dc8
parent 31656958d6c536a9716e7c2d544db3748d55da2a
author Colin Cross <ccross@android.com> 1531341027 -0700
committer android-build-merger <android-build-merger@google.com> 1531341027 -0700

[automerger skipped] Use manifest merger in Soong
am: 31656958d6  -s ours

Change-Id: I1b0d68dcf1b62b6cfd42b34f952ac361843f1527