Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 13 Jun 2017 22:56:24 +0000 (22:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Jun 2017 22:56:25 +0000 (22:56 +0000)
commit47e683efe54094b07d0feeff617c7141d20a556d
tree3ad13599a413a13ba55f86bbedc2e51e890cb91f
parent66241e9dbbb5b448ba5bd5a231f0ab270c198a57
parent252fb76fec02af6e2281da3bc9eea4e0d7972f12
Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev