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

Change-Id: I1e908652ace060b7d21b1550df4db40edafa4024


Trivial merge