am 5b2bfeee: am d9492e17: Fix compilation after update to MockWebServer
Neil Fuller [Mon, 27 Oct 2014 11:24:09 +0000 (11:24 +0000)]
* commit '5b2bfeee5257c6ec2952157343314eaea6fb86b3':
  Fix compilation after update to MockWebServer


Trivial merge