Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:49:43 +0000 (17:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:49:43 +0000 (17:49 +0000)
am: 1ab3bb626f

Change-Id: Ic7f936df24b5772dd216987bb613f0d3e139b48b


Trivial merge