Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev...
authorPyry Haulos <phaulos@google.com>
Thu, 28 Apr 2016 15:20:08 +0000 (15:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Apr 2016 15:20:08 +0000 (15:20 +0000)
am: 3fc4e2a

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

Change-Id: Ib480827a946d8b9567dc8bc3cee58654e8eda7de


Trivial merge