Merge \"Add simple Vulkan smoke test that doesn\'t use OpName\" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 21:51:58 +0000 (21:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 21:51:58 +0000 (21:51 +0000)
am: 60f4db1695

Change-Id: Ic1c9980b7a8fa5a5784a4fa3a239da0e57647047


Trivial merge