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

Change-Id: Ic7f370c8928392c9e2ba8f67e28ef5381d6f178e


Trivial merge