Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 2d64b0f13c am: 8777374f40
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 19:13:15 +0000 (19:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Jan 2017 19:13:15 +0000 (19:13 +0000)
am: bc83b2482a

Change-Id: I8b67d842a9baaa1ebbbbb9f5987cad0812bd93d1


Trivial merge