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

Change-Id: I6278b40f699992663aab369dfcaf1e860f6e8efa


Trivial merge