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

Change-Id: Ib2e7deb9edac97d12f55313d43d2a96320c3f631


Trivial merge