| commit | 8284e5f37ed249ad3c6436fa0df61bd370196266 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Apr 26 04:11:07 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 26 04:11:07 2016 +0000 |
| tree | d180070654ddd6bbbeb3aca7e10510b1b676b5d6 | |
| parent | c4b12fab8141077338cba26774001cafe11ee025 [diff] | |
| parent | e5075f07409fc6bec1355b07ecf3515bfa1e0dd2 [diff] |
Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev