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

Change-Id: I57fbe13a917900b4e4a98a9a719b0de64bbc6004


Trivial merge