Commit 113a90b6 authored by Daniel Xie's avatar Daniel Xie Committed by android-build-merger
Browse files

Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev am: 8284e5f3 

am: 386cd9c3

* commit '386cd9c3':
  Fix a race closing MockSpdyPeer.

Change-Id: I8c02d23e7d3792b6b3aae13d9a20b258e444e657
parents 8857d6f3 386cd9c3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment