Merge "Fix typo in vk::getNumShaderStages() return type" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Tue, 29 Mar 2016 19:32:06 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Mar 2016 19:32:06 +0000 (19:32 +0000)
am: 3d23fe0

* commit '3d23fe02889504823146fd28b862c2182da02046':
  Fix typo in vk::getNumShaderStages() return type

Change-Id: Ib21f351a2eab4f39610a2de5342df32ee042edf1


Trivial merge