Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev...
authorPyry Haulos <phaulos@google.com>
Thu, 28 Apr 2016 15:16:24 +0000 (15:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Apr 2016 15:16:24 +0000 (15:16 +0000)
commit3fc4e2a9a95907dc11d308c671fbe655e0273c6e
tree637c2ff30c2777f79d7d50070cf96a62065b5c8b
parent860941f907afa59f27f8ca3eba7e1270993432d4
parentfb270ce0726e507bf9fb35876ebb2c6e95f4788b
Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev am: d5474b5
am: fb270ce

* commit 'fb270ce0726e507bf9fb35876ebb2c6e95f4788b':
  Touch watchdog during object cleanup in max_concurrent tests

Change-Id: I985c7113991501a3fa7f2eab872a088884f61acd