Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 28 Apr 2016 15:02:15 +0000 (15:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 Apr 2016 15:02:15 +0000 (15:02 +0000)
commitd5474b54c32b7f165ab45efb052eb058a29990f2
tree637c2ff30c2777f79d7d50070cf96a62065b5c8b
parentaf3898ef2652fb1efc299b09fbd92aba93565908
parent9bd29e9ddec5c2404fd26ec0676422bf8b9eddcd
Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev
external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp