Commit 9c0f52b4 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... 

Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev am: 8284e5f3 am: 386cd9c3 am: 113a90b6 am: e3deca19 am: 19ddbba3
am: 0481d3fa

* commit '0481d3fa':
  Fix a race closing MockSpdyPeer.

Change-Id: I003adfa0252da7db2acef6a8580fac760e4097e1
parents 08cb5181 0481d3fa
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