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

Change-Id: I07414b170eae876a57cbbe82907690c6fae9841b


Trivial merge