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

Change-Id: Ifd080a3bb8d7bb3577f5e449021e00df0c482922


Trivial merge