Merge "Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 16 May 2016 23:10:09 +0000 (23:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 16 May 2016 23:10:09 +0000 (23:10 +0000)
commite65b7df71b339675aa7b8b622a0897c5ce62dc67
treee927b18d02ee263c584a2cd514c48196296e0846
parente87e989626aeb4f757cd13a1b6113d161393e6c1
parent4863662ab0ccacd9a82f36d5901bf0c03e04df45
Merge "Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into nyc-dev am: 64a1499846 am: dc6d679957" into nyc-mr1-dev-plus-aosp