Commit 3da24fc2 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

Change-Id: Icd37a57e8780af54bd31e1249fc000668fd6aea8
parents d982f318 244e7d35
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