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)
commit4e236ae65576164b2506ece644d547c0786becef
treee927b18d02ee263c584a2cd514c48196296e0846
parent99bf9ecdf35ae59af7cc5c15c499c18d2cc767b5
parent64a14998467dae667cfc1bee8fc4023ced4ad06d
Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev
am: 64a1499846

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

Change-Id: Ia3109b4880cef7cf35110443a9d8df56c114837e