tree 1a7cd73e496077eaade6381950e220c447a9137b
parent b13f7506e450cbb0aec1cdf94f7ad8425073dce7
parent 9a257719a8df8fa3db9505f80014b991fb470451
author Android Merger <android-build-merger@google.com> 1489694613 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1489694614 +0000

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