Merge aosp/master into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 23:15:10 +0000 (16:15 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 23:15:10 +0000 (16:15 -0700)
commit4c5c8a283d3488cec27cf51b1bc12f9052f6aae0
treeb029198fc9208e7c74b192f599a122f85be7ae9e
parentcd9b7adaa58e310609b9d7e6b468f68fe85b95eb
parent5f69b2705177ea1e15976e2b482fb49be911e7b0
Merge aosp/master into gerrit/vulkan-cts-1.0-dev

Change-Id: Ibf4b35b71a439aea29fcc520887e21c6365d89a3