Merge "Fix typo in vk::getNumShaderStages() return type" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Tue, 29 Mar 2016 19:10:26 +0000 (19:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 29 Mar 2016 19:10:26 +0000 (19:10 +0000)

Trivial merge