OSDN Git Service

Merge \"Fix flaky discoverable stress test.\" into nyc-mr1-dev
authorSharvil Nanavati <sharvil@google.com>
Tue, 7 Jun 2016 22:23:38 +0000 (22:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 22:23:38 +0000 (22:23 +0000)
commit293b05077895a979993e00cc3ada3aeb896bce52
treee3f168739a1137a7f6db3a0c3db30013a126378b
parentcf45195f0cdb37be2143bb7d0776f0a9053a7dff
parent9e67da47f35589198a1d73c7eef7b871a318655d
Merge \"Fix flaky discoverable stress test.\" into nyc-mr1-dev
am: 9e67da47f3

Change-Id: I5583238b6de24571762c656253510b469cd810f1