Commit b16f9b79 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
am: af2597d8  -s ours

Change-Id: I38b257cc5b4ee0b40f91894d4055ce2d07e591f0
parents ac0463f3 af2597d8
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