Merge "Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests...
authorPyry Haulos <phaulos@google.com>
Mon, 16 May 2016 23:14:10 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 23:14:10 +0000 (23:14 +0000)
am: e65b7df71b

* commit 'e65b7df71b339675aa7b8b622a0897c5ce62dc67':

Change-Id: Ia1b63950eaa523f9e73258e67e2930ecc591290f


Trivial merge