Commit e3deca19 authored by Takeshi Katae's avatar Takeshi Katae Committed by android-build-merger
Browse files

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

am: 113a90b6

* commit '113a90b6':
  Fix a race closing MockSpdyPeer.

Change-Id: Iab8ab1b737854b360fa951dac007670f1c2822ea
parents 8857d6f3 113a90b6
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