Touch watchdog before freeing objs in max_concurrent am: 815781b777 am: 6cbc014cfb
authorPyry Haulos <phaulos@google.com>
Wed, 14 Jun 2017 01:37:38 +0000 (01:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Jun 2017 01:37:38 +0000 (01:37 +0000)
am: e7f15283a8

Change-Id: I4c44f6777f50bf9026b1f6b93c7e871ad0c89f1b


Trivial merge