Merge "Merge "Touch watchdog during object cleanup in max_concurrent tests" into...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 28 Apr 2016 15:16:37 +0000 (15:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 Apr 2016 15:16:37 +0000 (15:16 +0000)

Trivial merge