projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b5121b e87e989)
Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into...
authorPyry Haulos <phaulos@google.com>
Mon, 16 May 2016 23:14:08 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 23:14:08 +0000 (23:14 +0000)
am: e87e989626

* commit 'e87e989626aeb4f757cd13a1b6113d161393e6c1':
  Revert "Touch watchdog during object cleanup in max_concurrent tests"

Change-Id: I24f8894453d177e0f9dc8d3984e10fa56c884864


Trivial merge
Domain: Graphics System / GL;