Merge "CP: Fix geometry shader support check am: 0da63cfe1d am: 705c0dd3b0 am: 04702a...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Sep 2016 17:12:23 +0000 (17:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Sep 2016 17:12:23 +0000 (17:12 +0000)

Trivial merge