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

Change-Id: I71e5d3716ad723a675e889a1fd5d2476317e9c4d


Trivial merge