Merge upstream vulkan-cts-1.0-dev into AOSP master
authorPyry Haulos <phaulos@google.com>
Wed, 27 Jul 2016 15:20:13 +0000 (15:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 15:20:13 +0000 (15:20 +0000)
am: 20a7a532b4

Change-Id: Iee33b99ac2a07a2233c6c187c946fa377c406245

1  2 
Android.mk

diff --cc Android.mk
Simple merge