Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683efe5
authorPyry Haulos <phaulos@google.com>
Tue, 13 Jun 2017 23:21:47 +0000 (23:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 23:21:47 +0000 (23:21 +0000)
am: 8d5e165a14

Change-Id: I5949e6a570a12c224b80d5d4e144fc9fbd73594f


Trivial merge