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

Change-Id: I875683c2153ab37659f1743efa41051749e7e16b


Trivial merge