am a2a4cdbb: Merge "Fix compilation after update to MockWebServer"
Neil Fuller [Tue, 28 Oct 2014 17:34:25 +0000 (17:34 +0000)]
* commit 'a2a4cdbb0fb83fb4350be77a8c7fc8a9181f9408':
  Fix compilation after update to MockWebServer

1  2 
tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java