aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Katae <takeshi.katae.xm@kyocera.jp>2016-04-27 20:35:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-27 20:35:16 +0000
commit0481d3fadcb9b417b703292418bfbda1f6964651 (patch)
tree4452e01013d9e3b7f3a43c1b5b090a46a8b37344
parent6b171660c821f02ea7b03175c696e3152b7d8003 (diff)
parent19ddbba3a61e9560e45cf81bf53c0c7272ce013f (diff)
downloadokhttp-0481d3fadcb9b417b703292418bfbda1f6964651.tar.gz
Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev am: 8284e5f am: 386cd9c am: 113a90b am: e3deca1
am: 19ddbba * commit '19ddbba3a61e9560e45cf81bf53c0c7272ce013f': Fix a race closing MockSpdyPeer. Change-Id: Icd24675b57b6f5d03edc93c7f5473fafd65ad6a4
0 files changed, 0 insertions, 0 deletions