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)
commit9c32d5d6038d44f20edf2d2e7306b9efc4f03b1b
treebef6ab829da8c68fc4708b2ab03e308882372aaa
parent39aaa0087032aa515de0ef14d52e40f1a56ad6fb
parente65b7df71b339675aa7b8b622a0897c5ce62dc67
Merge "Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev am: 64a1499846 am: dc6d679957" into nyc-mr1-dev-plus-aosp
am: e65b7df71b

* commit 'e65b7df71b339675aa7b8b622a0897c5ce62dc67':

Change-Id: Ia1b63950eaa523f9e73258e67e2930ecc591290f