Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 18:47:23 +0000 (11:47 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 18:47:23 +0000 (11:47 -0700)
commit68e9111d15c8fd6aac2a37d51924ad3a49b82d7e
tree48c2c2af3facb2eedb33cacf197add101e894a57
parentac343841e4736c115cf8a456dc450cdb91a08d45
parent97a21fa2c454d550628fc1c832381693c487e771
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: I77ef339c402c1be6247e98cfe76ea15eb8d46054
Android.mk
framework/common/tcuTexture.hpp