Commit af2597d8 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: Remove StuckServer using backlog and tests relying on it"... 

Merge "DO NOT MERGE: Remove StuckServer using backlog and tests relying on it" into marshmallow-cts-dev am: 244e7d35  -s ours am: 3da24fc2 am: c0a40153
am: 54fd3d51

Change-Id: I1c6ffbe9fac06829218d2576acb8a81ba1521ca4
parents 2f108dad 54fd3d51
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