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

Change-Id: Ib791e60d22fb604403136316f16f4bc70afd177c


Trivial merge