refs/heads/marshmallow-mr1-dev - platform/external/mockwebserver

commit: 6c9ca4c4097e6f6e1296fafb8dcc5fc66a2f21cc
[log]
author: Neil Fuller <[email protected]>
Wed Oct 29 17:13:50 2014 +0000
committer: Android Git Automerger <[email protected]>
Wed Oct 29 17:13:50 2014 +0000
tree: b3a5ffe5caaddb9ac91a15025a89c8e84d64bf2e
parent: 6f5c8be5e4f247437f6e0f195b4e3712851e4bef [diff]
parent: 7f9280b5b6ff3532ef27d4f938aa2e6bbc895473 [diff]

am 7f9280b5: Merge "Add throttling support to MockWebServer"

* commit '7f9280b5b6ff3532ef27d4f938aa2e6bbc895473':
  Add throttling support to MockWebServer

tree: b3a5ffe5caaddb9ac91a15025a89c8e84d64bf2e

src/
Android.mk
COPYING
MODULE_LICENSE_APACHE2