Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68e9111d15
authorPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 20:46:03 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Aug 2016 20:46:03 +0000 (20:46 +0000)
am: 0e5e3a7b7d

Change-Id: Iea957e5849886ce490074297090ed3cf8565e3a8


Trivial merge