Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683efe5
authorPyry Haulos <phaulos@google.com>
Tue, 13 Jun 2017 23:24:29 +0000 (23:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 23:24:29 +0000 (23:24 +0000)
commit539da2c8fe50e5fef964d0ea1ed76c9bf329b647
tree122eaa133683bea802bdcb89cba4e99ed2539315
parenta8c13603a00454219db2ff753f9d565e64824cc2
parent3b58165c1ae8050d844e4e18a1e707e9433ed79b
Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683efe5
am: 3b58165c1a

Change-Id: Ib9b71a0c267a1b2a663dd26413453763112bea51