projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a93e93a d5474b5)
Merge "Touch watchdog during object cleanup in max_concurrent tests" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 28 Apr 2016 15:12:11 +0000 (15:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Apr 2016 15:12:11 +0000 (15:12 +0000)
am: d5474b5

* commit 'd5474b54c32b7f165ab45efb052eb058a29990f2':
  Touch watchdog during object cleanup in max_concurrent tests

Change-Id: I1d51158f531bd039a73ee8b7d634bea9ee502047


Trivial merge
Domain: Graphics System / GL;