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

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

Change-Id: Ia3109b4880cef7cf35110443a9d8df56c114837e


Trivial merge