tree 8f392eef90653382678dd3bee9091e87c2318c94
parent bba196045adae9a2198c50fca00b1bb76d1f0275
parent 435f021d986c6209070069f1dff4aa4d410c72a7
author Colin Cross <ccross@android.com> 1551737628 -0800
committer android-build-merger <android-build-merger@google.com> 1551737628 -0800

Add manifest-merger module
am: 435f021d98

Change-Id: I2a23c59c30a7fe06935f9a4e8004015c012f9eb3