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

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

Merge "Merge "DO NOT MERGE: Remove StuckServer using backlog and tests relying on it" into marshmallow-cts-dev am: 244e7d35  -s ours" into nougat-cts-dev
am: 8de6ec43  -s ours

Change-Id: I352f3c55b1092a5c50ccaee2d11eff0acbc2655c
parents 2ab6d92d 8de6ec43
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