Commit 19ddbba3 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

* commit 'e3deca19':
  Fix a race closing MockSpdyPeer.

Change-Id: I9d38572a465fd9b4e1dae85acac318fb0204213f
parents 8857d6f3 e3deca19
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