| commit | a636f16b3422492b0941cafda7443e6c9443d0bb | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Sep 08 13:29:54 2017 -0700 |
| committer | Colin Cross <ccross@android.com> | Mon Sep 18 21:08:58 2017 +0000 |
| tree | 507cb9ae7d0587a93947447d3fca393fc806994c | |
| parent | 11d1c9b02fe3b4620ac6190ac3e9df5dc87cca27 [diff] |
Upgrade to ManifestMerger2 Switch to using ManifestMerger2 from prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/25.3.1/manifest-merger-25.3.1.jar Bug: 36005379 Test: m -j checkbuild Change-Id: Ia03a1eb096ebab9578e5b08183faa86f6818ff3c Merged-In: I83bd3f95778e93796d06f063aa7c61d2a63b117b (cherry picked from commit e76e8021ebaca486aee8e82d6a3ce25a10bc3974)