Merge aosp/master into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 18:04:19 +0000 (10:04 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 18:04:19 +0000 (10:04 -0800)
commit9e849a501764433e9aed3c658bba305d081c424c
treee65cb7a398780ef418f0c51254d5cdfcc8a06cad
parentb3d768dca33f7e4f3e2fa6232ca5d5518c25a4fc
parent736c62404462744aa62a15c7bab2d1ee23f9734d
Merge aosp/master into gerrit/vulkan-cts-1.0-dev

Change-Id: I6d61156e336937d8c2f534a410b6f2a92987f037