Commit 872100e7 authored by Kazuhiro Inaba's avatar Kazuhiro Inaba Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: Stabilize testConcurrentServerSocketCloseReliablyThrows."... 

Merge "DO NOT MERGE: Stabilize testConcurrentServerSocketCloseReliablyThrows." into nougat-mr1-cts-dev am: 00a16ee4  -s ours
am: 79ca4a55

Change-Id: Ibcabdfb1dbf245c8148dec88a535713d9848425a
parents 1ba9a16e 79ca4a55
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