am d9492e17: Fix compilation after update to MockWebServer
Neil Fuller [Mon, 27 Oct 2014 11:19:53 +0000 (11:19 +0000)]
* commit 'd9492e1781af07a0a5d7a8135118bf75febab6e4':
  Fix compilation after update to MockWebServer


Trivial merge