tree f7b9ce679275534cc178dda1c06c6a074980f9fd
parent 6247b330f431b8dc56b1fc2370c20d5197ea648c
parent 8284e5f37ed249ad3c6436fa0df61bd370196266
author Takeshi Katae <takeshi.katae.xm@kyocera.jp> 1461644089 +0000
committer android-build-merger <android-build-merger@google.com> 1461644089 +0000

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

* commit '8284e5f37ed249ad3c6436fa0df61bd370196266':
  Fix a race closing MockSpdyPeer.

Change-Id: I318e1e55d6393776e9ade38d64ae144a43becdaa