fix conflicts, merge upstream

Author: mcxiaoke

src/main/java/com/android/volley/toolbox/JsonArrayRequest.java

@@ -122,7 +122,7 @@ public JsonArrayRequest(String url, JSONObject jsonRequest, Listener<JSONArray>
         this(jsonRequest == null ? Method.GET : Method.POST, url, jsonRequest,
                 listener, errorListener);
     }
-    
+
     @Override
     protected Response<JSONArray> parseNetworkResponse(NetworkResponse response) {
         try {

src/test/java/com/android/volley/toolbox/JsonRequestTest.java

@@ -17,6 +17,7 @@
 package com.android.volley.toolbox;
 
 import com.android.volley.Response;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,6 +38,8 @@ public void publicMethods() throws Exception {
 
         assertNotNull(JsonArrayRequest.class.getConstructor(String.class,
                 Response.Listener.class, Response.ErrorListener.class));
+        assertNotNull(JsonArrayRequest.class.getConstructor(int.class, String.class, JSONArray.class,
+                Response.Listener.class, Response.ErrorListener.class));
 
         assertNotNull(JsonObjectRequest.class.getConstructor(String.class, JSONObject.class,
                 Response.Listener.class, Response.ErrorListener.class));