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

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

Change-Id: Ie4ba07e11b8c3f7c048545f42971e89373c8020c


Trivial merge
Domain: Graphics System / GL;