projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f95ab1 49d34a2)
am 49d34a23: (-s ours) am 521e5c62: Merge "Remove textureprojlodoffset.sampler3d_floa...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:43 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:43 +0000 (10:45 +0000)
* commit '49d34a233448603cd16cfc574e439761f1d969cf':


Trivial merge
Domain: Graphics System / GL;