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

Change-Id: I136d2d720cfaf5126a3dd40442127863cc7caa4f


Trivial merge