Merge "Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 16 May 2016 23:10:09 +0000 (23:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 16 May 2016 23:10:09 +0000 (23:10 +0000)

Trivial merge