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

Change-Id: Ia7dedbaf3e830eb38f62917456227d3495743964