Merge upstream-vulkan-cts-1.0-dev into master
authorPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 21:49:43 +0000 (21:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 21:49:43 +0000 (21:49 +0000)
am: fb20fc5f5d

Change-Id: Ibdfcd16a02e4779a3c610b7d50c68b2762802a15


Trivial merge