commit | da6ef439254c0833693bbb929205958620ed57dd | [log] [tgz] |
---|---|---|
author | Yi Kong <yikong@google.com> | Thu Mar 16 20:06:27 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 20:06:27 2017 +0000 |
tree | eea75bf2ef0991e4e2ddf0ed35c950d628383f86 | |
parent | 64a03e1cc7fd861a89dda04269d5b68310b6aa8d [diff] | |
parent | 8de6ec43d2a498f312e833b1ee8a28b7710ac28b [diff] |
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