tree 0a88903bd05eb9aba66c75e27d2f591c8593e879
parent 8857d6f3a31bfe14983f915cdbc72d40e473474e
parent 113a90b61310ad6406ffcbf47b22bf16669c6726
author Takeshi Katae <takeshi.katae.xm@kyocera.jp> 1461644432 +0000
committer android-build-merger <android-build-merger@google.com> 1461644432 +0000

Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev am: 8284e5f am: 386cd9c
am: 113a90b

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

Change-Id: Iab8ab1b737854b360fa951dac007670f1c2822ea