Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 16 May 2016 23:02:27 +0000 (23:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 16 May 2016 23:02:27 +0000 (23:02 +0000)

Trivial merge