Merge upstream vulkan-cts-1.0-dev into AOSP master am: 20a7a532b4
authorPyry Haulos <phaulos@google.com>
Wed, 27 Jul 2016 15:23:14 +0000 (15:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 15:23:14 +0000 (15:23 +0000)
am: 79572f8a12

Change-Id: I9c9083e9d318f487366e1d27955de721b72d7151


Trivial merge