Merge "Triangle test fixes" into vulkan
authorPyry Haulos <phaulos@google.com>
Wed, 5 Aug 2015 14:15:10 +0000 (14:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 5 Aug 2015 14:15:10 +0000 (14:15 +0000)

Trivial merge