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

* commit 'ab8e322159388609774ab7ee5490f25ffdf5a517':

Change-Id: I3a640f857d69be05b0cee034aac252ef24d486aa


Trivial merge
Domain: Graphics System / GL;