Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683ef...
authorPyry Haulos <phaulos@google.com>
Wed, 14 Jun 2017 00:11:13 +0000 (00:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Jun 2017 00:11:13 +0000 (00:11 +0000)
commit9f1eb573e064acd6d6357c4a355a992e3cb4c81c
tree122eaa133683bea802bdcb89cba4e99ed2539315
parente64c47b5a6aa34691d7ebef16be0674092358195
parent539da2c8fe50e5fef964d0ea1ed76c9bf329b647
Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683efe5 am: 3b58165c1a
am: 539da2c8fe

Change-Id: I3179ecaacec0b99134726db78417c4bf3d2a3c38