Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:20:46 +0000 (18:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:20:46 +0000 (18:20 +0000)
am: 036e6dbac6

Change-Id: Ie8bc9fd4f95c131af0e7a5b46488b921647bc8bf


Trivial merge