Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: a18cb02cb8 am: c1ec0ab210...
authorPyry Haulos <phaulos@google.com>
Thu, 25 Aug 2016 19:16:46 +0000 (19:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 19:16:46 +0000 (19:16 +0000)
am: adbdbcd51f

Change-Id: I5ba7cfe34c6bb4f03e1b77fa7f2ab55ec0ac9acb


Trivial merge