Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: a18cb02cb8 am: c1ec0ab210
authorPyry Haulos <phaulos@google.com>
Thu, 25 Aug 2016 19:01:29 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 19:01:29 +0000 (19:01 +0000)
am: e009aa14ff

Change-Id: I2b29c6cb54d503391f2b06697d2256815febcbbf


Trivial merge