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)
commit36d0c42e06c99dc767a5bf74e3eed02dffd0c376
tree637c2ff30c2777f79d7d50070cf96a62065b5c8b
parent860941f907afa59f27f8ca3eba7e1270993432d4
parentd6b9cfde8547cf8f86736dc10faf4c0ac5acf745
Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev am: d5474b5
am: d6b9cfd

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

Change-Id: I631cee4fa66908406cd775e06f0d3d5b95b50427