projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8c1360 3b58165)
Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am: 47e683efe5
authorPyry Haulos <phaulos@google.com>
Tue, 13 Jun 2017 23:24:29 +0000 (23:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 23:24:29 +0000 (23:24 +0000)
am: 3b58165c1a

Change-Id: Ib9b71a0c267a1b2a663dd26413453763112bea51


Trivial merge
Domain: Graphics System / GL;