Merge "Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f4...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Sep 2016 17:12:26 +0000 (17:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Sep 2016 17:12:27 +0000 (17:12 +0000)

Trivial merge