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

Change-Id: I2aa73621947b61f99a4419ae9194547df56bfbef