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

Change-Id: I2a8a992d4728cbb46c1243f5cf235a2231f7c9ab


Trivial merge