tree 8df59c868f7a48fc8b29d11d0cc543acbf669a90
parent c04a00e4fbfd19fc19be653ea915223ffd6e70b8
parent e8fce4f6c6d6d676fa589acc798e099268fad4a2
author Android Merger <android-build-merger@google.com> 1489694972 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1489694973 +0000

Merge "Merge "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" into nougat-mr1-cts-dev am: 56551f050c  -s ours"