Merge "NetworkImage - fix nullPointerException."
diff --git a/build.gradle b/build.gradle
index 5bfb394..d28959d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,19 +5,26 @@
     buildToolsVersion = 17
 
     sourceSets {
-        main {
-            manifest {
-                srcFile 'AndroidManifest.xml'
-            }
+        defaultConfig {
+            testPackageName 'com.android.volley.tests'
+        }
 
-            java {
-                srcDirs = ['src']
-            }
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
+        main {
+            assets.srcDirs       = ['assets']
+            res.srcDirs          = ['res']
+            aidl.srcDirs         = ['src']
+            resources.srcDirs    = ['src']
             renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
+            java.srcDirs         = ['src']
+            manifest.srcFile 'AndroidManifest.xml'
+
+        }
+
+        instrumentTest {
+            assets.srcDirs    = ["tests/assets"]
+            res.srcDirs       = ["tests/res"]
+            resources.srcDirs = ["tests/src"]
+            java.srcDirs      = ["tests/src"]
         }
     }
-}
\ No newline at end of file
+}