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

Change-Id: Idf3323736ca15d90b27b45f1ac690cdc21f556f7


Trivial merge