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

Change-Id: Icb304e91b6e8e0da3c3b10916c9e52bdeb55d531


Trivial merge