Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: d04e72de0b am: eac76634d8...
authorPyry Haulos <phaulos@google.com>
Fri, 23 Sep 2016 21:34:52 +0000 (21:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 21:34:52 +0000 (21:34 +0000)
am: f3d24e55d9

Change-Id: Id1dbae4445dbe2881108de20aec36aab49476163


Trivial merge