Merge "Check for shader type support in negative shader directive tests" into nougat...
authorTina Zhou <tinazh@google.com>
Wed, 19 Oct 2016 16:10:20 +0000 (16:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 16:10:20 +0000 (16:10 +0000)
am: 5b8758faed

Change-Id: Ia547c4b669db5dc68cc8cd7e88d69fac14492ece


Trivial merge