am f15182c5: am 8f21a39f: am a2a4cdbb: Merge "Fix compilation after update to MockWeb...
Neil Fuller [Wed, 29 Oct 2014 17:37:30 +0000 (17:37 +0000)]
* commit 'f15182c5d4fbe6d6312a6ab50be2ab89939b47b6':
  Fix compilation after update to MockWebServer


Trivial merge