Merge "Merge "Touch watchdog during object cleanup in max_concurrent tests" into...
authorPyry Haulos <phaulos@google.com>
Thu, 28 Apr 2016 15:20:09 +0000 (15:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Apr 2016 15:20:09 +0000 (15:20 +0000)
commit373ae06140947261072df52ef0c1e63be84afd06
tree5b33b155ad06ffebf7a7ad9cae82eb4348ebb1e8
parent6490b5a3b829442ab12f9cc22e3ab6dabfcc91ff
parentab8e322159388609774ab7ee5490f25ffdf5a517
Merge "Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev am: d5474b5 am: d6b9cfd" into nyc-mr1-dev-plus-aosp
am: ab8e322

* commit 'ab8e322159388609774ab7ee5490f25ffdf5a517':

Change-Id: I3a640f857d69be05b0cee034aac252ef24d486aa