projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6554f3 cc191e5)
resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71 am: 29baf28a2f
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 20:20:45 +0000 (20:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 20:20:45 +0000 (20:20 +0000)
am: cc191e57bf

Change-Id: I83e0feec7501f032e0c291d3b2c28af1f4c0821f


Trivial merge
Domain: Graphics System / GL;