Commit 79ca4a55 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

Change-Id: I29a4b788bf41e33afad66356fa64bf2b706e392c
parents a70d4b82 00a16ee4
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