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)
commit6490b5a3b829442ab12f9cc22e3ab6dabfcc91ff
tree5b33b155ad06ffebf7a7ad9cae82eb4348ebb1e8
parentbd3be2335a0cc0cbc6a10b268ebafc1e30f9519b
parent3fc4e2a9a95907dc11d308c671fbe655e0273c6e
Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev am: d5474b5 am: fb270ce
am: 3fc4e2a

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

Change-Id: Ib480827a946d8b9567dc8bc3cee58654e8eda7de