commit | 710a41358af7b0638570a644f08b80a2725fbe94 | [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:03:23 2017 +0000 |
tree | 904aa45ad9db3e98b310795be81eecb740d06c8c | |
parent | 1fe8e3c66d2612a1dad4b7afa3a59c6ad26be9c8 [diff] |
Upgrade to ManifestMerger2 Switch to using ManifestMerger2 from prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/26.0.0-beta2/manifest-merger-26.0.0-beta2.jar Bug: 36005379 Test: m -j checkbuild Change-Id: I83bd3f95778e93796d06f063aa7c61d2a63b117b Merged-In: I83bd3f95778e93796d06f063aa7c61d2a63b117b (cherry picked from commit e76e8021ebaca486aee8e82d6a3ce25a10bc3974)