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

Change-Id: Ia798ebba97cba3ba1d1d6e8ab9cdb196ba8c275f


Trivial merge