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""
Update build-tools version for gradle.

Change-Id: I12d25605b1491c515460dcccfd70fd7333f28f3b
Disable break on lint error.

Change-Id: I757cf92bc2b2e0e3ab1041c24be15a06a7960350
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 a0ef298f: am 1593ad9b: Merge "Volley to create valid NetworkResponse object when cache is disabled"

* commit 'a0ef298f8d5230af62eb21a9cf65fca85c3a45b5':
  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 83c5b5b2: am 935af93e: Merge "Update .gitignore for gradle etc"

* commit '83c5b5b266b82e2f92184ea29d0d68eb56031135':
  Update .gitignore for gradle etc
am 2ca0424b: am 3d193137: Merge "Clean up some warnings"

* commit '2ca0424bfd75f148634a10c6ca19f1e20d45a7a2':
  Clean up some warnings
am 9ef5950c: am 01b87b29: Merge "Eclipse build updates"

* commit '9ef5950c750b322ed4a652a34b5a9b2c6d9f5edc':
  Eclipse build updates
resolved conflicts for merge of 6c78e499 to master

Change-Id: If2a1d6d8b7be71f450310ffa3c0cc9b35b563a02
am e44eb272: am 2259cd77: Merge "Use the view size to restrict NIV requests."

* commit 'e44eb27245a7a71ddc80cc56a8085ad7448be4fe':
  Use the view size to restrict NIV requests.