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

Change-Id: I1f44b3c0449459a57c28748c01caa8d012971439


Trivial merge