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

Change-Id: Ibe2779b489f22e615c5afc1bf5709d91bbb6792b


Trivial merge