projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 860941f fb270ce)
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: fb270ce

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

Change-Id: I985c7113991501a3fa7f2eab872a088884f61acd


Trivial merge
Domain: Graphics System / GL;