Commit f9b580c4 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 am: 872100e7
am: 62315edb  -s ours

Change-Id: I84cbadbf2150f13c922f52f734d56a3663712ea1
parents bbea315f 62315edb
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