projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6094fa 02b6148)
Merge "resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp" into oc-mr1...
authorMika Isojärvi <misojarvi@google.com>
Tue, 5 Sep 2017 20:24:54 +0000 (20:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Sep 2017 20:24:54 +0000 (20:24 +0000)
am: 02b614843e

Change-Id: I2a8d839c0e2c5fcdb40241f661d451538edc9d4b


Trivial merge
Domain: Graphics System / GL;