Snapshot 621d3b6adc5a7cb6f13e27610aa33af48f13da27 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I3e2f8acd6054389626ab7c0f9065c8d905e99436

1 files changed, 3 insertions, 1 deletions

diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 6e0380171f3a..675c181aee11 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -608,6 +608,9 @@ def layoutAndroid(String androidHome) {
       jar("layoutlib-api.jar") {
         module("layoutlib-api")
       }
+      jar("manifest-merger.jar") {
+        module("manifest-merger")
+      }
       jar("sdk-tools.jar") {
         module("assetstudio")
         module("ddmlib")
@@ -616,7 +619,6 @@ def layoutAndroid(String androidHome) {
         module("lint-cli")
         module("lint-api")
         module("lint-checks")
-        module("manifest-merger")
         module("ninepatch")
         module("sdk-common")
       }