tree 0a88903bd05eb9aba66c75e27d2f591c8593e879
parent 8857d6f3a31bfe14983f915cdbc72d40e473474e
parent e3deca193e3353a7f6d593378535b4e3bf8cc728
author Daniel Xie <dxie@google.com> 1461644621 +0000
committer android-build-merger <android-build-merger@google.com> 1461644621 +0000

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

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

Change-Id: I9d38572a465fd9b4e1dae85acac318fb0204213f