am 8f21a39f: am a2a4cdbb: Merge "Fix compilation after update to MockWebServer"
Neil Fuller [Wed, 29 Oct 2014 17:13:52 +0000 (17:13 +0000)]
* commit '8f21a39fcac1343f32f45a072b715e4cd8772836':
  Fix compilation after update to MockWebServer


Trivial merge