Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683ef...
authorPyry Haulos <phaulos@google.com>
Wed, 14 Jun 2017 00:10:56 +0000 (00:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Jun 2017 00:10:56 +0000 (00:10 +0000)
commite64c47b5a6aa34691d7ebef16be0674092358195
tree122eaa133683bea802bdcb89cba4e99ed2539315
parent1ebf478eaf35e225f7db58dd30591007c39654ab
parenta8c13603a00454219db2ff753f9d565e64824cc2
Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683efe5 am: 8d5e165a14
am: a8c13603a0

Change-Id: Icb304e91b6e8e0da3c3b10916c9e52bdeb55d531