Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev

author Pyry Haulos <phaulos@google.com>

Thu, 28 Apr 2016 15:02:15 +0000 (15:02 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 28 Apr 2016 15:02:15 +0000 (15:02 +0000)
author Pyry Haulos <phaulos@google.com>
Thu, 28 Apr 2016 15:02:15 +0000 (15:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 28 Apr 2016 15:02:15 +0000 (15:02 +0000)
diff --cc external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
Simple merge
author	Pyry Haulos <phaulos@google.com>
	Thu, 28 Apr 2016 15:02:15 +0000 (15:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 28 Apr 2016 15:02:15 +0000 (15:02 +0000)