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

Change-Id: I0549db32e9bf0f60d14e79640592c7f93822e4aa


Trivial merge