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

Change-Id: I08ce091df192f9eb4a1815ebb8a46a93612b3caf


Trivial merge