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

Change-Id: I2c16e596fd38fb2a2b0455df8dab147fe69a8d99


Trivial merge