Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683ef...
authorPyry Haulos <phaulos@google.com>
Wed, 14 Jun 2017 00:11:13 +0000 (00:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Jun 2017 00:11:13 +0000 (00:11 +0000)
am: 539da2c8fe

Change-Id: I3179ecaacec0b99134726db78417c4bf3d2a3c38


Trivial merge