Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683efe5
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:56:47 +0000 (17:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:56:47 +0000 (17:56 +0000)
am: 3b58165c1a

Change-Id: I2719d97a2d3503498ab1a17d47868fe5e2e256dd


Trivial merge