am ccdd40c7: Follow MockWebServer API changes.
Jeff Sharkey [Thu, 9 May 2013 17:15:38 +0000 (10:15 -0700)]
* commit 'ccdd40c7230a1e82394e73d8f4c265f58095530d':
  Follow MockWebServer API changes.


Trivial merge