Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: dd398940da
authorPyry Haulos <phaulos@google.com>
Thu, 19 Jan 2017 03:12:08 +0000 (03:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 03:12:08 +0000 (03:12 +0000)
am: 9662ce0ae6

Change-Id: I12d056e9b99ebb5bee6cc48f511f138c7b14ab76


Trivial merge