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

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

Change-Id: I631cee4fa66908406cd775e06f0d3d5b95b50427


Trivial merge
Domain: Graphics System / GL;