Merge "Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f4...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:47:57 +0000 (17:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:47:57 +0000 (17:47 +0000)
commitd37f310198b3a210edbce7f39b5c2fdf3b254b88
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parentbb7ac9cac984bb9cfc196bd76add9cd3b30aeccc
parent70c033812ec0d6feb10241c9f55cfc66d2784406
Merge "Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476 am: 37f5919c34 am: d84ea44b50" into nyc-mr1-dev-plus-aosp
am: 70c033812e

Change-Id: Ic811e48ec88b410aaa04b33cdf2883d8bd35e4c3