am a2a4cdbb: Merge "Fix compilation after update to MockWebServer"
authorNeil Fuller <nfuller@google.com>
Tue, 28 Oct 2014 17:34:25 +0000 (17:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Oct 2014 17:34:25 +0000 (17:34 +0000)
commit8f21a39fcac1343f32f45a072b715e4cd8772836
treeb3747b21c4961f80a70853b1bff9d2edf037a002
parent1b1c5777ba1f828810ecea762afa9e0e462f0ad9
parenta2a4cdbb0fb83fb4350be77a8c7fc8a9181f9408
am a2a4cdbb: Merge "Fix compilation after update to MockWebServer"

* commit 'a2a4cdbb0fb83fb4350be77a8c7fc8a9181f9408':
  Fix compilation after update to MockWebServer
tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java