Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 22:26:33 +0000 (14:26 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 22:26:33 +0000 (14:26 -0800)
commita60da1e9ee45318207132a2d032d8ff1be99095f
tree6b8c32d7a434f6fc4ddbad1b3ea204b8b927794c
parent046279d71acb6bf6f0c2499e125406b0d85b2da0
parent0b0a77813bf29dc2c16bc32500a87909462be2bf
Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev

Change-Id: I4a04b54b92d507303ccf09b20b1fd643fe13e134
Android.mk