Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into...
authorPyry Haulos <phaulos@google.com>
Mon, 16 May 2016 23:14:08 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 23:14:08 +0000 (23:14 +0000)
commit39aaa0087032aa515de0ef14d52e40f1a56ad6fb
treebef6ab829da8c68fc4708b2ab03e308882372aaa
parent0b5121b0965988041ce2d5ba7ead30cce67aa4b0
parente87e989626aeb4f757cd13a1b6113d161393e6c1
Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev am: 64a1499846 am: 4e236ae655
am: e87e989626

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

Change-Id: I24f8894453d177e0f9dc8d3984e10fa56c884864