From f9feb3182fbef8749a8a1c4d87075dcc04053015 Mon Sep 17 00:00:00 2001
From: Shawn Meier <shawn.meier@gmail.com>
Date: Tue, 15 Dec 2015 20:28:14 -0700
Subject: [PATCH] added merged case to gradle-to-droidel

---
 lib/gradle-to-droidel.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/gradle-to-droidel.sh b/lib/gradle-to-droidel.sh
index fdc7821b..e2ba0b5e 100755
--- a/lib/gradle-to-droidel.sh
+++ b/lib/gradle-to-droidel.sh
@@ -34,7 +34,10 @@ else
 	echo "classes dir not found"
 fi
 
-if [ -d $appdir/build/intermediates/res/ ]
+if [ -d $appdir/build/intermediates/res/merged/ ]
+then
+	cp -R $appdir/build/intermediates/res/merged/$build/layout $target/res/layout
+elif [ -d $appdir/build/intermediates/res/ ]
 then
 	cp -R $appdir/build/intermediates/res/$build/layout $target/res/layout
 elif [ -d $appdir/res/layout ]