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

Change-Id: I2aa73621947b61f99a4419ae9194547df56bfbef


Trivial merge