commit ecfdf7238021c518535e3fb65c46b0e6b48477e1
author Xavier Ducrohet <xav@android.com> Wed Feb 06 16:45:34 2013 -0800
committer Xavier Ducrohet <xav@android.com> Wed Feb 06 16:46:05 2013 -0800
tree 027bbc2f98aaf693260ce058a958c1040d073cac
parent c3d26c652e7004324569c9384510214981f759b3

Fix tests running on the server.

Change-Id: Ie74170cc51c16545c6a004aaba570c2bf11d7314

build.gradle

diff --git a/build.gradle b/build.gradle
index 4f7f342..2ea838a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@
         }
     }
 
-     findbugs {
+    findbugs {
         ignoreFailures = true
         effort = "max"
         reportLevel = "high"

builder/src/test/resources/testData/resources/incMergeData/basicValues2/overlay/keepfolder.txt

diff --git a/builder/src/test/resources/testData/resources/incMergeData/basicValues2/overlay/keepfolder.txt b/builder/src/test/resources/testData/resources/incMergeData/basicValues2/overlay/keepfolder.txt
new file mode 100644
index 0000000..09786ef
--- /dev/null
+++ b/builder/src/test/resources/testData/resources/incMergeData/basicValues2/overlay/keepfolder.txt
@@ -0,0 +1 @@
+To keep the folder around.
\ No newline at end of file