am 6b83583c: Merge commit \'a6ddf34f63cfd2ef7be20dae45d515c2ffd5ae0a\' into HEAD

* commit '6b83583cd3e30096fac9eb1fc6c31151cb56686a':
am 379c1aec: Merge commit \'aad56dda40dca1d9b6418ef48f12257101b2c7b2\' into HEAD

* commit '379c1aec119acef172452b17dca481cedb86ba0f':
am 3334f157: Merge "Revert "Revert "Add in additional http request types"""

* commit '3334f157874f20353d1510f8e6910b59c6a83970':
  Revert "Revert "Add in additional http request types""
am 1593ad9b: Merge "Volley to create valid NetworkResponse object when cache is disabled"

* commit '1593ad9b3d0877f8139700ccd3e5d1b65bd92a49':
  Volley to create valid NetworkResponse object when cache is disabled
am 935af93e: Merge "Update .gitignore for gradle etc"

* commit '935af93eaeac38b0855047c3eeaeabb23f741a14':
  Update .gitignore for gradle etc
am 3d193137: Merge "Clean up some warnings"

* commit '3d193137da53cbd1fd53e875696e0896822f604d':
  Clean up some warnings
am 01b87b29: Merge "Eclipse build updates"

* commit '01b87b29d97a49bba435d9f7b7eddb7691b7d2a9':
  Eclipse build updates
am c8348cc6: Merge "Update Gradle build"

* commit 'c8348cc6b2f780f63ba193fc6af4fc875fec0fe3':
  Update Gradle build
am 2259cd77: Merge "Use the view size to restrict NIV requests."

* commit '2259cd77724553cfb5e1dadfeae536412c507c10':
  Use the view size to restrict NIV requests.
am 6358cb08: Merge "Add a basic test for NetworkImageView"

* commit '6358cb0819f8bae7bfc6ac492721ca3015956c6b':
  Add a basic test for NetworkImageView
am 4a6d3f5e: Merge "Allow method chaining on setters"

* commit '4a6d3f5ee11e7df0ca7760d895213739dbf084ff':
  Allow method chaining on setters
am 5bc98edb: Merge "volley: fix build"

* commit '5bc98edbbdd61dcf1a8985e4450730826b9ac7f3':
  volley: fix build
am e542f496: Merge "Fix generic type parameter for RequestQueue.add(Request)"

* commit 'e542f4964d2b6668c028edce5afe1fe2faefc64b':
  Fix generic type parameter for RequestQueue.add(Request)
am 6c339176: Merge "Guard against NullPointerException currently occurring in Volley when a Request is given a url whose host is null."

* commit '6c339176312237f7786851602916f7f44c61dfb8':
  Guard against NullPointerException currently occurring in Volley when a Request is given a url whose host is null.
ImageLoader: setError after null check

if request was canceled it will have already been removed
from mInFlightRequests and cause NPE

Change-Id: I1ce78bb6b3b2964545a47b5e3bb59bdf1a6d940e
Merge "ImageLoader: setError after null check"
Merge commit 'f7d19f946f83684a894a797ebb531d647b0730c3' into HEAD
Fixes bug in PATCH method. Sets the method before setting the body.

Just look at PUT and POST methods some lines above. The method is set 
before calling to addBodyIfExists().

The method should be set before adding the body. Otherwise, some libraries will
try to establish a connection with the wrong method (GET by default). 

Change-Id: I993a62cdc5cbccbf54f9bae4f6b183e2edf4304d
Merge "Fixes bug in PATCH method. Sets the method before setting the body."
Fix crash/OOM in DiskBasedCache

DiskBasedCache.writeHeader() can throw an IOException and swallow it. This causes the
cache entry to be partially written followed by the entry's data. When reading back,
it is possible to read back the data segment (garbled part) when attempting to parse
the cache header.

Change-Id: I3022ca1566bc60e5869bb4ec384c866b4ba5c1c5