Merge "Merge upstream-vulkan-cts-1.0-dev into master" am: 553f24edf2 am: ecfd015f05...
authorPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 21:58:30 +0000 (21:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 21:58:30 +0000 (21:58 +0000)
am: d7a232b7bb

Change-Id: I863cd086f7c1039319afb046bf2c63aafb936f04


Trivial merge