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)
commitdd8eda7b1911d60be88da8ebc0a986adef5a79c5
tree19a954060ca949c7bcd683ce2eadb2a61c7ca121
parentc8f41e25a5f3be88eab7acf4d9256dad4e70903f
parent3b58165c1ae8050d844e4e18a1e707e9433ed79b
Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683efe5
am: 3b58165c1a

Change-Id: I2719d97a2d3503498ab1a17d47868fe5e2e256dd