tree eea75bf2ef0991e4e2ddf0ed35c950d628383f86
parent 64a03e1cc7fd861a89dda04269d5b68310b6aa8d
parent 8de6ec43d2a498f312e833b1ee8a28b7710ac28b
author Yi Kong <yikong@google.com> 1489694787 +0000
committer android-build-merger <android-build-merger@google.com> 1489694787 +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
am: 8de6ec43d2  -s ours

Change-Id: If9f6c374d32052c73883c645791eace320328af2