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

Change-Id: I74b0651ad282c00e5ac515acd566252855ad475a


Trivial merge