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

Change-Id: Ibb55a0f3911569f7759ca1adb607d626312e9f94


Trivial merge