projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 670588f 108d396)
resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am...
authorNicolas Boichat <drinkcat@google.com>
Tue, 20 Dec 2016 22:34:40 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 22:34:40 +0000 (22:34 +0000)
am: 108d39675d

Change-Id: Iee9f8deb6d1fee977e59d58a97d0b0f2b4e56129


Trivial merge
Domain: Graphics System / GL;