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)
commit79572f8a123ee341f7cb7cd5d0e81cf157490d17
tree3caf7e3fde1f3011933c71b5636fa2767557222f
parent38cac339a5087a019b03a368dbff721e7b9fcdcd
parent20a7a532b4531b9d49c63bc3fc16f3fad659c400
Merge upstream vulkan-cts-1.0-dev into AOSP master
am: 20a7a532b4

Change-Id: Iee33b99ac2a07a2233c6c187c946fa377c406245
Android.mk