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

Change-Id: Id4bc4bf09fcb68abe0de58885b6d6b151e0b1203


Trivial merge