Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into...
authorPyry Haulos <phaulos@google.com>
Mon, 16 May 2016 23:10:02 +0000 (23:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 23:10:02 +0000 (23:10 +0000)
commit4863662ab0ccacd9a82f36d5901bf0c03e04df45
treee927b18d02ee263c584a2cd514c48196296e0846
parent06da3c9c5e3bf3db7324f7c8d10a795a3ebfbbc6
parentdc6d6799578d93e6b60e40bf349cfdfe0ef18a78
Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev am: 64a1499846
am: dc6d679957

* commit 'dc6d6799578d93e6b60e40bf349cfdfe0ef18a78':
  Revert "Touch watchdog during object cleanup in max_concurrent tests"

Change-Id: I109a4be64fae960d649bb545ca9186d3d3f9b37b